Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement

cement-business/pom.xml

@@ -38,12 +38,10 @@
         <dependency>
             <groupId>org.redisson</groupId>
             <artifactId>redisson</artifactId>
-            <version>3.11.1</version>
         </dependency>
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -68,7 +66,6 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <!--<version>5.1.45</version>-->
-            <version>8.0.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -99,7 +96,6 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>4.6.8</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.freemarker/freemarker -->
         <dependency>
@@ -110,28 +106,28 @@
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt</artifactId>
-            <version>0.9.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>23.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>3.17</version>
         </dependency>
+
         <!-- https://mvnrepository.com/artifact/net.oschina.zcx7878/fastdfs-client-java -->
         <dependency>
             <groupId>net.oschina.zcx7878</groupId>
             <artifactId>fastdfs-client-java</artifactId>
-            <version>1.27.0.0</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
         </dependency>
     </dependencies>
 

cement-business/src/main/java/cn/wise/sc/cement/business/controller/CabinetController.java

+package cn.wise.sc.cement.business.controller;
+
+
+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.service.ICabinetService;
+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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-10-19
+ */
+@Api(tags = "存储柜子管理")
+@RestController
+@RequestMapping("/business/cabinet")
+public class CabinetController {
+
+    final
+    ICabinetService iCabinetService;
+
+    public CabinetController(ICabinetService iCabinetService) {
+        this.iCabinetService = iCabinetService;
+    }
+
+    @PostMapping("/new")
+    @ApiOperation("新增柜子")
+    public BaseResponse<Boolean> newCabinet(@RequestBody Cabinet cabinet) {
+
+        boolean save = iCabinetService.save(cabinet);
+        if (save) {
+            return BaseResponse.okData(true);
+        } else {
+            return BaseResponse.errorMsg("添加失败!");
+        }
+    }
+
+    @PutMapping("/edit")
+    @ApiOperation("编辑柜子")
+    public BaseResponse<Boolean> editCabinet(@RequestBody Cabinet cabinet) {
+        boolean b = iCabinetService.updateById(cabinet);
+        if (b) {
+            return BaseResponse.okData(true);
+        } else {
+            return BaseResponse.errorMsg("更新失败失败!");
+        }
+    }
+
+    @GetMapping("/page")
+    @ApiOperation("查询柜子分页")
+    public BaseResponse<IPage<Cabinet>> page(PageQuery pageQuery) {
+        IPage<Cabinet> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
+        return BaseResponse.okData(iCabinetService.page(page));
+    }
+
+}
+

cement-business/src/main/java/cn/wise/sc/cement/business/controller/SampleController.java

 package cn.wise.sc.cement.business.controller;
 
-
+import cn.hutool.core.codec.Base64;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.qrcode.QrCodeUtil;
 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.StandardQuery;
 import cn.wise.sc.cement.business.service.ISampleService;
 import cn.wise.sc.cement.business.service.ISysDictionaryService;
+import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -16,103 +19,160 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.imageio.ImageIO;
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author ztw
  * @since 2020-09-04
  */
-@Api(tags="样品管理")
+@Api(tags = "样品管理")
 @RestController
 @RequestMapping("/business/sample")
 public class SampleController {
 
-	private static final Logger log = LoggerFactory.getLogger("SampleController");
-
-	@Autowired
-	private ISampleService sampleService;
-	@Autowired
-	private ISysDictionaryService dictionaryService;
-
-	@ApiOperation(value = "样品分页列表")
-	@ApiImplicitParams(value = {
-			@ApiImplicitParam(name = "sampleName", value = "样品名称", paramType = "query", dataType = "String"),
-			@ApiImplicitParam(name = "cementCode", value = "样品本所编号", paramType = "query", dataType = "String")
-	})
-	@GetMapping("/getPage")
-	public BaseResponse getPage(PageQuery pageQuery, String sampleName, String cementCode) {
-		try {
-			return sampleService.getPage(pageQuery, sampleName, cementCode);
-		} catch (Exception e) {
-			log.debug("样品分页列表{}", e);
-		}
-		return BaseResponse.errorMsg("失败!");
-	}
-
-	@ApiOperation("样品列表导出")
-	@PostMapping("/export")
-	public void export(String sampleName, String cementCode,
-	                   String fileName, HttpServletResponse response) {
-		try {
-			sampleService.export(sampleName, cementCode,
-					 fileName, response);
-		} catch (Exception e) {
-			log.debug("样品列表导出{}", e);
-		}
-	}
-
-
-
-
-	@ApiOperation(value = "样品详情")
-	@GetMapping("/{id}")
-	public BaseResponse getById(@PathVariable Integer id){
-		try {
-			return sampleService.getDetail(id);
-		}catch (Exception e){
-			log.debug("样品详情{}",e);
-		}
-		return BaseResponse.errorMsg("失败!");
-	}
-
-	@ApiOperation(value = "样品登记")
-	@PostMapping("/register")
-	public BaseResponse register(@RequestBody SampleManageQuery query) {
-		try {
-			return sampleService.register(query);
-		}catch (Exception e) {
-			log.debug("样品登记{}",e);
-		}
-		return BaseResponse.errorMsg("失败!");
-	}
-
-	@ApiOperation(value = "样品销毁")
-	@PostMapping("/destruction/{id}")
-	public BaseResponse destruction(@PathVariable Integer id) {
-		try {
-			return sampleService.destruction(id);
-		}catch (Exception e) {
-			log.debug("样品销毁{}",e);
-		}
-		return BaseResponse.errorMsg("失败!");
-	}
-
-	@ApiOperation(value = "获取样品状态列表")
-	@GetMapping("/getSampleFormList")
-	public BaseResponse getSampleFormList(){
-		try {
-			return dictionaryService.getContent("样品状态");
-		}catch (Exception e){
-			log.debug("获取样品状态列表{}",e);
-		}
-		return BaseResponse.errorMsg("失败!");
-	}
-
-
+    private static final Logger log = LoggerFactory.getLogger("SampleController");
+
+    @Autowired
+    private ISampleService sampleService;
+    @Autowired
+    private ISysDictionaryService dictionaryService;
+
+    @ApiOperation(value = "样品分页列表")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "sampleName", value = "样品名称", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "cementCode", value = "样品本所编号", paramType = "query", dataType = "String")
+    })
+    @GetMapping("/getPage")
+    public BaseResponse getPage(PageQuery pageQuery, String sampleName, String cementCode) {
+        try {
+            return sampleService.getPage(pageQuery, sampleName, cementCode);
+        } catch (Exception e) {
+            log.debug("样品分页列表{}", e);
+        }
+        return BaseResponse.errorMsg("失败!");
+    }
+
+    @ApiOperation("样品列表导出")
+    @PostMapping("/export")
+    public void export(String sampleName, String cementCode,
+                       String fileName, HttpServletResponse response) {
+        try {
+            sampleService.export(sampleName, cementCode,
+                    fileName, response);
+        } catch (Exception e) {
+            log.debug("样品列表导出{}", e);
+        }
+    }
+
+    @ApiOperation(value = "样品详情")
+    @GetMapping("/{id}")
+    public BaseResponse getById(@PathVariable Integer id) {
+        try {
+            return sampleService.getDetail(id);
+        } catch (Exception e) {
+            log.debug("样品详情{}", e);
+        }
+        return BaseResponse.errorMsg("失败!");
+    }
+
+    @ApiOperation(value = "样品登记")
+    @PostMapping("/register")
+    public BaseResponse register(@RequestBody SampleManageQuery query) {
+        try {
+            return sampleService.register(query);
+        } catch (Exception e) {
+            log.debug("样品登记{}", e);
+        }
+        return BaseResponse.errorMsg("失败!");
+    }
+
+    @ApiOperation("绑定样品信息")
+    @PutMapping("/bind/savePosition")
+    public BaseResponse<String> bindSavePosition(@RequestBody SampleManageQuery query) {
+
+        try {
+            return sampleService.bindSavePosition(query);
+        } catch (Exception e) {
+            log.debug("样品登记{}", e);
+        }
+        return BaseResponse.errorMsg("失败!");
+    }
+
+    @ApiOperation("样品复查")
+    @PutMapping("/review")
+    public BaseResponse<Boolean> ampleReview(Integer id) {
+        return sampleService.ampleReview(id);
+    }
+
+    @ApiOperation("获取存储位置二维码")
+    @PostMapping("/saverq/init")
+    public BaseResponse<List<String>> getSaveRQ(@RequestBody List<String> savePositions) throws IOException {
+
+        if (CollectionUtil.isEmpty(savePositions)) {
+            log.error("生成存储位置二维码失败!savePosition参数为空!");
+        }
+        ByteArrayOutputStream stream = new ByteArrayOutputStream();
+        List<String> rts = new ArrayList<>(savePositions.size());
+        for (String savePosition : savePositions) {
+            stream.reset();
+            BufferedImage bufferedImage = QrCodeUtil.generate(savePosition, 200, 200);
+            ImageIO.write(bufferedImage, "png", stream);
+            String base64 = Base64.encode(stream.toByteArray());
+            rts.add(base64);
+            System.out.println(base64);
+        }
+        stream.close();
+        return BaseResponse.okData(rts);
+    }
+
+    @ApiOperation("获取样品二维码")
+    @PostMapping("/samplerq/init")
+    public BaseResponse<String> getSampleRQ(String sampleId) throws IOException {
+
+        if (StrUtil.isBlank(sampleId)) {
+            log.error("生成样品二维码失败!savePosition参数为空!");
+        }
+        ByteArrayOutputStream stream = new ByteArrayOutputStream();
+        BufferedImage bufferedImage = QrCodeUtil.generate(sampleId, 200, 200);
+        ImageIO.write(bufferedImage, "png", stream);
+        stream.close();
+        return BaseResponse.okData(Base64.encode(stream.toByteArray()));
+    }
+
+
+    @ApiOperation(value = "样品销毁")
+    @PostMapping("/destruction/{id}")
+    public BaseResponse destruction(@PathVariable Integer id) {
+        try {
+            return sampleService.destruction(id);
+        } catch (Exception e) {
+            log.debug("样品销毁{}", e);
+        }
+        return BaseResponse.errorMsg("失败!");
+    }
+
+
+    @ApiOperation(value = "获取样品状态列表")
+    @GetMapping("/getSampleFormList")
+    public BaseResponse getSampleFormList() {
+        try {
+            return dictionaryService.getContent("样品状态");
+        } catch (Exception e) {
+            log.debug("获取样品状态列表{}", e);
+        }
+        return BaseResponse.errorMsg("失败!");
+    }
 
 }
 

cement-business/src/main/java/cn/wise/sc/cement/business/entity/Cabinet.java

+package cn.wise.sc.cement.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-10-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class Cabinet implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String name;
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/entity/Sample.java

@@ -3,11 +3,9 @@ package cn.wise.sc.cement.business.entity;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.io.Serializable;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -98,7 +96,7 @@ public class Sample implements Serializable {
     @ApiModelProperty("原样位置")
     private String originalPosition;
 
-    @ApiModelProperty("（0未领用，1已领用，2已销毁）")
+    @ApiModelProperty("（0未领用，1已领用，2已销毁，3复查）")
     private Integer status;
 
     @ApiModelProperty("销毁时间")
@@ -112,6 +110,4 @@ public class Sample implements Serializable {
 
     @ApiModelProperty("样品是否校核完成（0未检测完成， 1检测完成，）")
     private Integer isCheck;
-
-
 }

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/CabinetMapper.java

+package cn.wise.sc.cement.business.mapper;
+
+import cn.wise.sc.cement.business.entity.Cabinet;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-10-19
+ */
+public interface CabinetMapper extends BaseMapper<Cabinet> {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/CabinetMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wise.sc.cement.business.mapper.CabinetMapper">
+
+</mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SampleCheckTeamQuery.java

 package cn.wise.sc.cement.business.model.query;
 
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.mysql.cj.xdevapi.JsonArray;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Map;
 
 /**

cement-business/src/main/java/cn/wise/sc/cement/business/service/ICabinetService.java

+package cn.wise.sc.cement.business.service;
+
+import cn.wise.sc.cement.business.entity.Cabinet;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-10-19
+ */
+public interface ICabinetService extends IService<Cabinet> {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/ISampleService.java

@@ -31,4 +31,17 @@ public interface ISampleService extends IService<Sample> {
 	void export(String sampleName, String cementCode,
 	            String fileName, HttpServletResponse response);
 
+	/**
+	 * 绑定位置信息
+	 * @param query 小样绑定位置信息
+	 * @return 成功与否
+	 */
+	BaseResponse<String> bindSavePosition(SampleManageQuery query);
+
+	/**
+	 * 样品复查
+	 * @param id  样品id
+	 * @return 复查成功与否
+	 */
+	BaseResponse<Boolean> ampleReview(Integer id);
 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/CabinetServiceImpl.java

+package cn.wise.sc.cement.business.service.impl;
+
+import cn.wise.sc.cement.business.entity.Cabinet;
+import cn.wise.sc.cement.business.mapper.CabinetMapper;
+import cn.wise.sc.cement.business.service.ICabinetService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-10-19
+ */
+@Service
+public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> implements ICabinetService {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java

@@ -269,8 +269,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
                         }
                     }
                     if(teamNameList.contains("Al2O3")){
-                        if(!teamNameList.contains("Fe2O3")){
-                            return BaseResponse.errorMsg("选择Al2O3必须要选择Fe2O3");
+                        if(!teamNameList.contains("Fe2o3")){
+                            return BaseResponse.errorMsg("选择Al2O3必须要选择Fe2o3");
                         }
                     }
                 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SysDictionaryServiceImpl.java

@@ -5,12 +5,9 @@ import cn.wise.sc.cement.business.mapper.SysDictionaryMapper;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.service.ISysDictionaryService;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mysql.cj.xdevapi.JsonArray;
 import org.springframework.stereotype.Service;
-
 import javax.annotation.Resource;
 
 /**

mybatis-generator/pom.xml

@@ -14,7 +14,6 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-generator</artifactId>
-            <version>3.3.1</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
@@ -28,7 +27,6 @@
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-core</artifactId>
-            <version>2.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>

pom.xml

@@ -65,10 +65,55 @@
                 <artifactId>commons-collections4</artifactId>
                 <version>4.2</version>
             </dependency>
+            <dependency>
+                <groupId>cn.hutool</groupId>
+                <artifactId>hutool-all</artifactId>
+                <version>4.6.8</version>
+            </dependency>
+            <dependency>
+                <groupId>net.oschina.zcx7878</groupId>
+                <artifactId>fastdfs-client-java</artifactId>
+                <version>1.27.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>io.jsonwebtoken</groupId>
+                <artifactId>jjwt</artifactId>
+                <version>0.9.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>23.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi</artifactId>
+                <version>3.17</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>2.6</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.zxing</groupId>
+                <artifactId>core</artifactId>
+                <version>3.3.3</version>
+            </dependency>
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
-                <version>5.1.39</version>
+                <version>8.0.18</version>
+            </dependency>
+            <dependency>
+                <groupId>org.redisson</groupId>
+                <artifactId>redisson</artifactId>
+                <version>3.11.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-generator</artifactId>
+                <version>3.3.1</version>
             </dependency>
             <!--日志-->
             <dependency>
@@ -77,6 +122,11 @@
                 <version>2.10.0</version>
                 <scope>compile</scope>
             </dependency>
+            <dependency>
+                <groupId>org.apache.velocity</groupId>
+                <artifactId>velocity-engine-core</artifactId>
+                <version>2.0</version>
+            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>jul-to-slf4j</artifactId>