Skip to content

T
tianjin-cement
Commit bbb18beb authored by 竹天卫's avatar 竹天卫
Browse files
Options

扫码存样

parent e8bb0d53
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 8 deletions
cement-business/pom.xml
View file @ bbb18beb
......@@ -204,9 +204,9 @@
<properties>
<env>dev</env><!-- 节点名字environment是自己随意取的 -->
</properties>
<activation>
<activeByDefault>true</activeByDefault><!-- 默认激活该profile节点-->
</activation>
<!--<activation>
<activeByDefault>true</activeByDefault>&lt;!&ndash; 默认激活该profile节点&ndash;&gt;
</activation>-->
</profile>
<profile>
<!-- 生产环境 -->
......@@ -224,9 +224,9 @@
<properties>
<env>show</env>
</properties>
<!-- <activation>
<activeByDefault>true</activeByDefault>&lt;!&ndash; 默认激活该profile节点&ndash;&gt;
</activation>-->
<activation>
<activeByDefault>true</activeByDefault><!-- 默认激活该profile节点-->
</activation>
</profile>
......
cement-business/src/main/java/cn/wise/sc/cement/business/controller/CabinetController.java
View file @ bbb18beb
package cn.wise.sc.cement.business.controller;
import cn.wise.sc.cement.business.entity.Cabinet;
import cn.wise.sc.cement.business.entity.SysPost;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.service.ICabinetService;
......@@ -8,6 +9,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -19,6 +22,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* <p>
* 前端控制器
......@@ -32,6 +37,8 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/business/cabinet")
public class CabinetController {
private static final Logger log = LoggerFactory.getLogger("CabinetController");
final
ICabinetService iCabinetService;
......@@ -78,5 +85,20 @@ public class CabinetController {
return BaseResponse.errorMsg("删除失败!");
}
}
@ApiOperation(value = "存储柜列表")
@GetMapping("/getList")
public BaseResponse getList() {
try {
List<Cabinet> list = iCabinetService.list();
return BaseResponse.okData(list);
} catch (Exception e) {
log.debug("存储柜列表{}", e);
}
return BaseResponse.errorMsg("失败!");
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/controller/SampleController.java
View file @ bbb18beb
......@@ -8,6 +8,7 @@ import cn.wise.sc.cement.business.entity.Cabinet;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.SampleManageQuery;
import cn.wise.sc.cement.business.model.query.SampleScanQuery;
import cn.wise.sc.cement.business.service.ISampleService;
import cn.wise.sc.cement.business.service.ISysDictionaryService;
import cn.wise.sc.cement.business.util.RedisUtil;
......@@ -188,6 +189,17 @@ public class SampleController {
}
}
@ApiOperation(value = "APP样品扫码存样")
@PostMapping("/sampleScan")
public BaseResponse sampleScan(@RequestBody SampleScanQuery query) {
try {
return sampleService.sampleScan(query);
} catch (Exception e) {
log.debug("APP样品扫码存样{}", e);
}
return BaseResponse.errorMsg("失败!");
}
public BaseResponse<String> editCabinet(String cabinetNames) {
if (StrUtil.isBlank(cabinetNames)) {
......
cement-business/src/main/java/cn/wise/sc/cement/business/controller/WeiXinController.java
View file @ bbb18beb
......@@ -115,9 +115,10 @@ public class WeiXinController {
@GetMapping("/signature")
@ApiOperation("获取accessToken")
public BaseResponse<String> signature(String param) {
System.out.println("***********************"+param+"**************************************");
System.out.println(param);
MessageDigest md;
String tmpStr = null;
try {
md = MessageDigest.getInstance("SHA-1");
byte[] digest = md.digest(param.getBytes());
......
cement-business/src/main/java/cn/wise/sc/cement/business/entity/Sample.java
View file @ bbb18beb
......@@ -97,6 +97,9 @@ public class Sample implements Serializable {
@ApiModelProperty("处理提醒时间")
private LocalDate handleDate;
@ApiModelProperty("存储柜表id")
private Integer cabinetId;
@ApiModelProperty("小样位置")
private String littlePosition;
......
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SampleScanQuery.java 0 → 100644
View file @ bbb18beb
package cn.wise.sc.cement.business.model.query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDate;
/**
* @description:
* @author: ztw
* @create: 2021-04-019
**/
@Data
@ApiModel("样品扫码存样请求")
public class SampleScanQuery {
@ApiModelProperty("样品表id")
private Integer sampleId;
@ApiModelProperty("存储柜表id")
private Integer cabinetId;
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/ISampleService.java
View file @ bbb18beb
......@@ -4,6 +4,7 @@ import cn.wise.sc.cement.business.entity.Sample;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.SampleManageQuery;
import cn.wise.sc.cement.business.model.query.SampleScanQuery;
import cn.wise.sc.cement.business.model.vo.SampleVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
......@@ -26,6 +27,8 @@ public interface ISampleService extends IService<Sample> {
BaseResponse<String> register(SampleManageQuery query);
BaseResponse<String> sampleScan(SampleScanQuery query);
BaseResponse<String> destruction(Integer id);
void export(String sampleName, String cementCode,
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SampleServiceImpl.java
View file @ bbb18beb
......@@ -3,14 +3,17 @@ package cn.wise.sc.cement.business.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.wise.sc.cement.business.entity.Cabinet;
import cn.wise.sc.cement.business.entity.Sample;
import cn.wise.sc.cement.business.enumation.FileExt;
import cn.wise.sc.cement.business.mapper.CabinetMapper;
import cn.wise.sc.cement.business.mapper.SampleMapper;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.SampleSaveDto;
import cn.wise.sc.cement.business.model.SampleWord;
import cn.wise.sc.cement.business.model.query.SampleManageQuery;
import cn.wise.sc.cement.business.model.query.SampleScanQuery;
import cn.wise.sc.cement.business.model.vo.SampleVo;
import cn.wise.sc.cement.business.service.ISampleService;
import cn.wise.sc.cement.business.service.ISysUserService;
......@@ -53,6 +56,9 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
this.userService = userService;
}
@Resource
private CabinetMapper cabinetMapper;
/**
* 分页列表
*
......@@ -112,6 +118,34 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
return BaseResponse.okData("样品登记成功");
}
/**
* 样品扫码存样
* @param query
* @return
*/
@Transactional
@Override
public BaseResponse<String> sampleScan(SampleScanQuery query) {
if (query.getSampleId() == null || query.getCabinetId() == null) {
return BaseResponse.errorMsg("参数错误!");
}
Sample sample = sampleMapper.selectById(query.getSampleId());
if (sample == null) {
return BaseResponse.errorMsg("样品信息错误");
}
Cabinet cabinet = cabinetMapper.selectById(query.getCabinetId());
if (cabinet == null) {
return BaseResponse.errorMsg("文件柜信息错误");
}
sample.setCabinetId(cabinet.getId())
.setRegisterTime(LocalDateTime.now())
.setLittlePosition(cabinet.getName());
sampleMapper.updateById(sample);
return BaseResponse.okData("扫码存样成功");
}
/**
* 样品销毁
*
......
cement-business/src/main/java/cn/wise/sc/cement/business/util/weixin/Global.java
View file @ bbb18beb
......@@ -59,7 +59,7 @@ public interface Global {
*/
public static final String SENDMESSAGE = "https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=ACCESS_TOKEN";
//公众号申请jsapi_ticket的地址
public static final String userTicket = "https://qyapi.weixin.qq.com/cgi-bin/ticket/get";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment