修复bug

dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java

@@ -13,6 +13,7 @@ import com.tykj.dev.misc.exception.ApiException;
 import com.tykj.dev.misc.utils.GetTreeUtils;
 import com.tykj.dev.misc.utils.PageUtil;
 import com.tykj.dev.misc.utils.ResultUtil;
+import io.swagger.annotations.ApiModelProperty;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -149,6 +150,13 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
                 int allotNum = 0;
                 int retiredNum = 0;
                 int useNum = 0;
+                List<Integer> inLibraryIds = new ArrayList<>();
+                List<Integer> repairIds = new ArrayList<>();
+                List<Integer> destoryIds = new ArrayList<>();
+                List<Integer> retiredIds = new ArrayList<>();
+                List<Integer> scrappedIds = new ArrayList<>();
+                List<Integer> allotIds = new ArrayList<>();
+                List<Integer> useIds = new ArrayList<>();
                 //遍历核心装备，按照相同型号的装备生命状态统计
                 for (DeviceLibrary d2 : libraryEntities) {
                     if (d2.getModel().equals(model)) {
@@ -158,33 +166,43 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
                         switch (d2.getLifeStatus()) {
                             case 2:
                                 inLibraryNum++;
+                                inLibraryIds.add(d2.getId());
                                 break;
                             case 3:
                                 allotNum++;
+                                allotIds.add(d2.getId());
                                 break;
                             case 4:
                                 repairNum++;
+                                repairIds.add(d2.getId());
                                 break;
                             case 5:
                                 scrappedNum++;
+                                scrappedIds.add(d2.getId());
                                 break;
                             case 6:
                                 allotNum++;
+                                allotIds.add(d2.getId());
                                 break;
                             case 12:
                                 retiredNum++;
+                                retiredIds.add(d2.getId());
                                 break;
                             case 9:
                                 destoryNum++;
+                                allotIds.add(d2.getId());
                                 break;
                             case 10:
                                 destoryNum++;
+                                destoryIds.add(d2.getId());
                                 break;
                             case 13:
                                 scrappedNum++;
+                                scrappedIds.add(d2.getId());
                                 break;
                             case 14:
                                 useNum++;
+                                useIds.add(d2.getId());
                                 break;
                             default:
                                 break;
@@ -194,6 +212,13 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
                 //添加统计vo
                 if (num > 0) {
                     deviceStatisticsVo.setDeviceIds(deviceIds);
+                    deviceStatisticsVo.setAllotIds(allotIds);
+                    deviceStatisticsVo.setDestoryIds(destoryIds);
+                    deviceStatisticsVo.setInLibraryIds(inLibraryIds);
+                    deviceStatisticsVo.setRepairIds(repairIds);
+                    deviceStatisticsVo.setRetiredIds(retiredIds);
+                    deviceStatisticsVo.setScrappedIds(scrappedIds);
+                    deviceStatisticsVo.setUseIds(useIds);
                     deviceStatisticsVo.setDeviceNumber(num);
                     deviceStatisticsVo.setAllotNum(allotNum);
                     deviceStatisticsVo.setInLibraryNum(inLibraryNum);

dev-library/src/main/java/com/tykj/dev/device/library/subject/vo/DeviceStatisticsVo.java

@@ -49,4 +49,26 @@ public class DeviceStatisticsVo {
 
     @ApiModelProperty(value = "该型号所有装备Id列表")
     private List<Integer> deviceIds = new ArrayList<>();
+
+    @ApiModelProperty(value = "该型号在库装备Id列表")
+    private List<Integer> inLibraryIds = new ArrayList<>();
+
+    @ApiModelProperty(value = "该型号维修装备Id列表")
+    private List<Integer> repairIds = new ArrayList<>();
+
+    @ApiModelProperty(value = "该型号销毁装备Id列表")
+    private List<Integer> destoryIds = new ArrayList<>();
+
+    @ApiModelProperty(value = "该型号退役装备Id列表")
+    private List<Integer> retiredIds = new ArrayList<>();
+
+    @ApiModelProperty(value = "该型号报废装备Id列表")
+    private List<Integer> scrappedIds = new ArrayList<>();
+
+    @ApiModelProperty(value = "该型号运输中装备Id列表")
+    private List<Integer> allotIds = new ArrayList<>();
+
+    @ApiModelProperty(value = "该型号使用中装备Id列表")
+    private List<Integer> useIds = new ArrayList<>();
+
 }

dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java

@@ -642,8 +642,26 @@ public class RepairController {
         if (level == 2 || level == 3) {
             repairBackBill = deviceRepairBackBillService.getOne(taskBto.getBillId());
         } else {
-            //结束父任务
-            taskService.moveToEnd(taskBto);
+            //判断是否修完
+            List<RepairDetail> deviceRepairDetailEntities = deviceRepairDetailService.findByBillId(taskBto.getBillId());
+            //获取所有装备的维修状态
+            Set<Integer> statusSet = deviceRepairDetailEntities.stream()
+                    .map(RepairDetail::getRepairStatus)
+                    .collect(Collectors.toSet());
+            //存放所有维修完成的状态
+            Set<Integer> integerSet = new HashSet<>();
+            integerSet.add(2);
+            integerSet.add(3);
+            integerSet.add(4);
+            integerSet.add(5);
+            integerSet.add(6);
+            //取交集
+            integerSet.retainAll(statusSet);
+            //如果取交集后size不变，则说明全部都是维修完成的状态
+            if (integerSet.size() == statusSet.size()) {
+                //结束父任务
+                taskService.moveToEnd(taskBto);
+            }
             RepairSendBill repairSendBill = deviceRepairSendBillDao.findByDeviceRepairBillId(taskBto.getBillId());
             repairBackBill = new RepairBackBill();
             repairBackBill.setSendUnit("中办");

dev-rfid/src/main/java/com/tykj/dev/rfid/controller/RfidController.java

@@ -103,10 +103,10 @@ public class RfidController {
 
     @ApiOperation(value = "打印标签", notes = "可以通过这个接口打印RFID")
     @PostMapping(value = "/print")
-    public ResponseEntity printRfid(@RequestBody List<String> rfid) {
+    public ResponseEntity printRfid(@RequestBody List<RfidPrintVo> rfid) {
         //调用打印服务 批量打印
-        for (String rfidContent : rfid) {
-            rfidService.printString(rfidContent);
+        for (RfidPrintVo printVo : rfid) {
+            rfidService.printString(printVo.getMakeNumber(),printVo.getMakeNumber(),printVo.getDeviceNumber());
         }
         return ResultUtil.success("打印成功");
     }

dev-rfid/src/main/java/com/tykj/dev/rfid/entity/vo/RfidPrintVo.java

+package com.tykj.dev.rfid.entity.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dengdiyi
+ */
+@Data
+@ApiModel("RFID打印VO")
+public class RfidPrintVo {
+
+    @ApiModelProperty(name = "生产号")
+    String makeNumber;
+
+    @ApiModelProperty(name = "装备号")
+    String deviceNumber;
+
+    @ApiModelProperty(name = "表面号")
+    String content;
+}

dev-rfid/src/main/java/com/tykj/dev/rfid/service/RfidService.java

 package com.tykj.dev.rfid.service;
 
 import com.tykj.dev.rfid.entity.vo.RfidCreateVo;
+import com.tykj.dev.rfid.entity.vo.RfidPrintVo;
 
 import java.util.List;
 
@@ -32,9 +33,11 @@ public interface RfidService {
      * 描述：调用打印机打印内容（如出现打印不对齐的情况请联系管理员）
      *
      * @param content 打印内容
+     * @param makeNumber 生产号
+     * @param deviceNumber 装备号
      * @return
      */
-    boolean printString(String content);
+    boolean printString(String makeNumber,String deviceNumber,String content);
 
     /**
      * 描述：生成装备的RFID表面号
@@ -42,6 +45,6 @@ public interface RfidService {
      * @param list RFID表面号生成类
      * @return
      */
-    List<String> getRfidNumber(List<RfidCreateVo> list);
+    List<RfidPrintVo> getRfidNumber(List<RfidCreateVo> list);
 
 }

dev-rfid/src/main/java/com/tykj/dev/rfid/service/impl/RfidServiceImpl.java

@@ -5,6 +5,7 @@ import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.misc.exception.ApiException;
 import com.tykj.dev.misc.utils.ResultUtil;
 import com.tykj.dev.rfid.entity.vo.RfidCreateVo;
+import com.tykj.dev.rfid.entity.vo.RfidPrintVo;
 import com.tykj.dev.rfid.service.RfidService;
 import com.zebra.sdk.comm.Connection;
 import com.zebra.sdk.comm.ConnectionException;
@@ -75,14 +76,21 @@ public class RfidServiceImpl implements RfidService {
         }
     }
 
-
+    /**
+     * 描述：调用打印机打印内容（如出现打印不对齐的情况请联系管理员）
+     *
+     * @param content 打印内容
+     * @param makeNumber 生产号
+     * @param deviceNumber 装备号
+     * @return
+     */
     @Override
-    public boolean printString(String content) {
+    public boolean printString(String makeNumber,String deviceNumber,String content) {
         try {
             Connection connection = new TcpConnection("192.168.0.222", 6101);
             connection.open();
             printer = ZebraPrinterFactory.getInstance(connection);
-            String demoFile = createDemoFile(printer.getPrinterControlLanguage(), content, 53, 80);
+            String demoFile = createDemoFile(printer.getPrinterControlLanguage(),makeNumber,deviceNumber, content, 53, 80);
             printer.sendFileContents(demoFile);
         } catch (ConnectionException e) {
             throw new ApiException(ResultUtil.failed("未找到对应的打印机"));
@@ -104,7 +112,7 @@ public class RfidServiceImpl implements RfidService {
      * @return 拼接成功的打印机ZPL
      * @throws IOException IO错误
      */
-    private String createDemoFile(PrinterLanguage pl, String content, int marginLeft, int marginTop) throws IOException {
+    private String createDemoFile(PrinterLanguage pl,String makeNumber,String deviceNumber, String content, int marginLeft, int marginTop) throws IOException {
 
         File tmpFile = File.createTempFile("TEST_ZEBRA", "LBL");
         FileOutputStream os = new FileOutputStream(tmpFile);
@@ -113,7 +121,7 @@ public class RfidServiceImpl implements RfidService {
 
         if (pl == PrinterLanguage.ZPL) {
             configLabel = ("^XA\n" +
-                    "^CW1,E:SIMSUN.FNT\n"+
+                    "^CW1,E:SIMSUN.FNT"+
                     "~TA000\n" +
                     "~JSN\n" +
                     "^LT0\n" +
@@ -128,7 +136,7 @@ public class RfidServiceImpl implements RfidService {
                     "~SD15\n" +
                     "^JUS\n" +
                     "^LRN\n" +
-                    "^CI27\n" +
+                    "^CI28\n" +
                     "^PA0,1,1,0\n" +
                     "^XZ\n" +
                     "^XA\n" +
@@ -138,10 +146,17 @@ public class RfidServiceImpl implements RfidService {
                     "^LS0\n" +
                     "\n" +
                     "^LH" + marginLeft + "," + marginTop + "\n" +
-                    "^A0N,60,25\n" +
-                    "^FD" +
-                    content +
-                    "^FS\n" +
+                    "^A1N,30,,E:SIM000.FNT^FR^FD\n" +
+                    "^LH"+marginLeft+",+"+marginTop +
+                    "^FDxx测试^FS\n" +
+                    "^A1N,30,,E:SIM000.FNT^FR^FD\n" +
+                    "^FO0,50^FD生产号："+makeNumber+"^FS\n" +
+                    "^A1N,30,,E:SIM000.FNT^FR^FD\n" +
+                    "^FO0,90^FD装备号："+deviceNumber+"^FS\n" +
+                    "^A1N,32,,E:SIM000.FNT^FR^FD\n" +
+                    "^FO0,130^FD表面号：^FS"+
+                    "^A1N,32,,E:SIM000.FNT^FR^FD\n" +
+                    "^FO0,170^FD"+content+"^FS"+
                     "^PQ1,0,1,Y\n" +
                     "^XZ\n" +
                     "^XZ").getBytes();
@@ -159,20 +174,27 @@ public class RfidServiceImpl implements RfidService {
      * @return
      */
     @Override
-    public List<String> getRfidNumber(List<RfidCreateVo> list) {
-        List<String> strings = new ArrayList<>();
+    public List<RfidPrintVo> getRfidNumber(List<RfidCreateVo> list) {
+        List<RfidPrintVo> rfidPrintVos = new ArrayList<>();
         //遍历List为每一个创建元素生成对应的RFID表面号
         for (RfidCreateVo r : list) {
             //如果传入的创建元素中不包含装备ID的话，则生成新的表面号
             //否则根据将已经装备的表面号插入LIST
+            RfidPrintVo rfidPrintVo = new RfidPrintVo();
             if (r.getDeviceTId() == null) {
-                strings.add(makeRfidNumber(r.getPartType(), r.getDeviceNumber(), r.getProduceNumber(), r.getDeviceType()));
+                rfidPrintVo.setMakeNumber(r.getProduceNumber());
+                rfidPrintVo.setDeviceNumber(r.getDeviceNumber());
+                rfidPrintVo.setContent(makeRfidNumber(r.getPartType(), r.getDeviceNumber(), r.getProduceNumber(), r.getDeviceType()));
+                rfidPrintVos.add(rfidPrintVo);
             } else {
                 DeviceLibrary device = deviceLibraryService.getOne(r.getDeviceTId());
-                strings.add(device.getRfidSurfaceId());
+                rfidPrintVo.setDeviceNumber(device.getSeqNumber());
+                rfidPrintVo.setMakeNumber(device.getProdNumber());
+                rfidPrintVo.setContent(device.getRfidSurfaceId());
+                rfidPrintVos.add(rfidPrintVo);
             }
         }
-        return strings;
+        return rfidPrintVos;
     }
 
     /**

dev-statistical/src/main/java/com/tykj/dev/statistical/service/impl/StatisticalServiceImpl.java

@@ -178,24 +178,30 @@ public class StatisticalServiceImpl implements StatisticalService {
         List<SelfInspection> nums=new ArrayList<>();
         //获取所有自查单
         List<SelfCheckBill> selfCheckBills = selfCheckBillDao.findAll();
+        //计算当前季度
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        String quarter = calendar.get(Calendar.YEAR)+"年"+SelfCheckSchedulerTask.getQuarter(calendar.get(Calendar.MONTH)+1);
+        //筛选出标题包含当前年份季度的
+        List<SelfCheckBill> selfCheckBillList = selfCheckBills.stream()
+                .filter(selfCheckBill -> selfCheckBill.getTitle().contains(quarter))
+                .collect(Collectors.toList());
         //获取所有市
         List<Area> areas = areaDao.findAreasByType(2);
         //遍历每个市
-        for (Area area:areas) {
+        for (Area area : areas) {
             //获取当前区域所有区县
             List<Area> sonAreas = areaDao.findAllByFatherId(area.getId());
             SelfInspection selfInspection = new SelfInspection();
             selfInspection.setAreaName(area.getName());
-            //计算当前季度
-            Calendar calendar = Calendar.getInstance();
-            calendar.setTime(new Date());
-            String quarter = calendar.get(Calendar.YEAR)+"年"+SelfCheckSchedulerTask.getQuarter(calendar.get(Calendar.MONTH)+1);
-            //获取未完成区县
-            List<Area> areas1 = getSelfCheckUndoAreas(area.getId(),quarter,selfCheckBills);
-            //set未完成数量
-            selfInspection.setNoCompleteCount(areas1.size());
-            //set已完成数量
-            selfInspection.setCompleteCount(sonAreas.size()-areas1.size());
+            if (selfCheckBillList.size()>0) {
+                //获取未完成区县
+                List<Area> areas1 = getSelfCheckUndoAreas(area.getId(), quarter, selfCheckBills);
+                //set未完成数量
+                selfInspection.setNoCompleteCount(areas1.size());
+                //set已完成数量
+                selfInspection.setCompleteCount(sonAreas.size() - areas1.size());
+            }
             nums.add(selfInspection);
         }
         return nums;
@@ -218,6 +224,19 @@ public class StatisticalServiceImpl implements StatisticalService {
         String quarter2 = calendar.get(Calendar.YEAR)+"年第二季度";
         String quarter3 = calendar.get(Calendar.YEAR)+"年第三季度";
         String quarter4 = calendar.get(Calendar.YEAR)+"年第四季度";
+        //筛选出标题包含当前年份季度的
+        List<SelfCheckBill> selfCheckBillList1 = selfCheckBills.stream()
+                .filter(selfCheckBill -> selfCheckBill.getTitle().contains(quarter1))
+                .collect(Collectors.toList());
+        List<SelfCheckBill> selfCheckBillList2 = selfCheckBills.stream()
+                .filter(selfCheckBill -> selfCheckBill.getTitle().contains(quarter2))
+                .collect(Collectors.toList());
+        List<SelfCheckBill> selfCheckBillList3 = selfCheckBills.stream()
+                .filter(selfCheckBill -> selfCheckBill.getTitle().contains(quarter3))
+                .collect(Collectors.toList());
+        List<SelfCheckBill> selfCheckBillList4 = selfCheckBills.stream()
+                .filter(selfCheckBill -> selfCheckBill.getTitle().contains(quarter4))
+                .collect(Collectors.toList());
         //遍历所有市
         areas.forEach(area -> {
             YearSelfInspection yearSelfInspection = new YearSelfInspection();
@@ -226,16 +245,24 @@ public class StatisticalServiceImpl implements StatisticalService {
             PerQuarter thirdQuarter = new PerQuarter();
             PerQuarter fourthQuarter = new PerQuarter();
             yearSelfInspection.setAreaName(area.getName());
-            List<Area> undoAreas = getSelfCheckUndoAreas(area.getId(),quarter1,selfCheckBills);
-            List<Area> undoAreas2 = getSelfCheckUndoAreas(area.getId(),quarter2,selfCheckBills);
-            List<Area> undoAreas3 = getSelfCheckUndoAreas(area.getId(),quarter3,selfCheckBills);
-            List<Area> undoAreas4 = getSelfCheckUndoAreas(area.getId(),quarter4,selfCheckBills);
             //获取当前区域所有区县
             List<Area> sonAreas = areaDao.findAllByFatherId(area.getId());
-            setPerQuarter(firstQuarter, sonAreas, undoAreas);
-            setPerQuarter(secondQuarter, sonAreas, undoAreas2);
-            setPerQuarter(thirdQuarter, sonAreas, undoAreas3);
-            setPerQuarter(fourthQuarter, sonAreas, undoAreas4);
+            if (selfCheckBillList1.size()>0){
+                List<Area> undoAreas = getSelfCheckUndoAreas(area.getId(),quarter1,selfCheckBills);
+                setPerQuarter(firstQuarter, sonAreas, undoAreas);
+            }
+            if (selfCheckBillList2.size()>0){
+                List<Area> undoAreas = getSelfCheckUndoAreas(area.getId(),quarter2,selfCheckBills);
+                setPerQuarter(secondQuarter, sonAreas, undoAreas);
+            }
+            if (selfCheckBillList3.size()>0){
+                List<Area> undoAreas = getSelfCheckUndoAreas(area.getId(),quarter3,selfCheckBills);
+                setPerQuarter(thirdQuarter, sonAreas, undoAreas);
+            }
+            if (selfCheckBillList4.size()>0){
+                List<Area> undoAreas = getSelfCheckUndoAreas(area.getId(),quarter4,selfCheckBills);
+                setPerQuarter(fourthQuarter, sonAreas, undoAreas);
+            }
             yearSelfInspection.setFirstQuarter(firstQuarter);
             yearSelfInspection.setSecondQuarter(secondQuarter);
             yearSelfInspection.setThirdQuarter(thirdQuarter);

dev-statistical/src/main/java/com/tykj/dev/statistical/vo/PerQuarter.java

@@ -14,12 +14,12 @@ public class PerQuarter {
     /**
      * 完成数量
      */
-    private Integer completeCount;
+    private Integer completeCount = 0;
 
     /**
      * 未完成数量
      */
-    private Integer noCompleteCount;
+    private Integer noCompleteCount = 0;
 
     /**
      * 未完成单位

dev-statistical/src/main/java/com/tykj/dev/statistical/vo/SelfInspection.java

@@ -19,10 +19,10 @@ public class SelfInspection {
     /**
      * 完成数量
      */
-    private Integer completeCount;
+    private Integer completeCount = 0;
 
     /**
      * 未完成数量
      */
-    private Integer noCompleteCount;
+    private Integer noCompleteCount = 0;
 }