feat(单位模块): 添加了单位逻辑注释

dev-allot/src/main/java/com/tykj/dev/device/allot/repository/AllotBackBillDao.java

@@ -8,4 +8,5 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
  * @author dengdiyi
  */
 public interface AllotBackBillDao extends JpaRepository<AllotBackBill, Integer>, JpaSpecificationExecutor<AllotBackBill> {
+
 }

dev-block/src/main/java/com/tykj/dev/device/block/controller/BlockController.java

@@ -32,13 +32,13 @@ public class BlockController {
     BlockDataService blockDataService;
 
 
-
-    @ApiOperation(value = "test", notes = "区块链")
-    @GetMapping("/test")
-    public ResponseEntity test(){
-    //AffQaQ55FCuQNqF3bj6nsMytMqbGUDrHe8VDXqb1cPgd7K1yB8X
-        return ResponseEntity.ok(blockService.sendText(1,1004,"{text}"));
-    }
+//
+//    @ApiOperation(value = "test", notes = "区块链")
+//    @GetMapping("/test")
+//    public ResponseEntity test(){
+//    //AffQaQ55FCuQNqF3bj6nsMytMqbGUDrHe8VDXqb1cPgd7K1yB8X
+//        return ResponseEntity.ok(blockService.sendText(1,1004,"{text}"));
+//    }
 
 
     @ApiOperation(value = "查询最新的20条数据", notes = "区块大屏")

dev-block/src/main/java/com/tykj/dev/device/block/entity/BlockAlarm.java

@@ -28,7 +28,7 @@ import javax.persistence.Table;
 @EntityListeners(AuditingEntityListener.class)
 @SQLDelete(sql = "update zt_block_alarm set delete_tag = 1 where id = ?")
 @Where(clause = "delete_tag = 0")
-@Table(name = "zt_block_alarm")
+@Table(name = "zb_block_alarm")
 @Builder
 public class BlockAlarm extends BaseEntity {
     /**

dev-block/src/main/java/com/tykj/dev/device/block/entity/BlockFillChainData.java

@@ -26,7 +26,7 @@ import javax.persistence.Table;
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
-@ApiModel("系统上链记录信息")
+@ApiModel("系统上链记录信息失败信息")
 @EntityListeners(AuditingEntityListener.class)
 @SQLDelete(sql = "update zt_block_fill_chain_data set delete_tag = 1 where id = ?")
 @Where(clause = "delete_tag = 0")

dev-block/src/main/java/com/tykj/dev/device/block/entity/bc/BcRecordData.java

 package com.tykj.dev.device.block.entity.bc;
 
-import com.tykj.carrier.block.entity.vo.BlockTraceabilityParsing;
-import com.tykj.carrier.misc.base.BeanHelper;
+import com.tykj.dev.device.block.entity.vo.BlockTraceabilityParsing;
+import com.tykj.dev.misc.base.BeanHelper;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

dev-block/src/main/java/com/tykj/dev/device/block/entity/vo/TraceabilityParsingData.java

@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * @program: carrier
@@ -36,7 +37,7 @@ public class TraceabilityParsingData {
     @ApiModelProperty(value = "操作时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private LocalDateTime operationTime;
+    private Date operationTime;
 
     @ApiModelProperty(value = "相关载体id")
     private String carrierIds;
@@ -44,6 +45,7 @@ public class TraceabilityParsingData {
     @ApiModelProperty(value = "单位名称")
     private String unitName;
 
+    @ApiModelProperty(value = "对应业务创建时间")
     private String time;
 
 

dev-block/src/main/java/com/tykj/dev/device/block/service/BlockService.java

@@ -13,9 +13,8 @@ public interface BlockService {
     /**
      * 业务类型码注册
      * @param subName 业务名称，可以是中英文
-     * @param systemId 系统id
      */
-    BcRegister subRegister(Integer systemId, String subName);
+    BcRegister subRegister( String subName);
 
 
     /**
@@ -23,21 +22,21 @@ public interface BlockService {
      * @param subCode 业务代码编号
      * @param content 文本 200k以内
      */
-    void sendText(Integer systemId, Integer subCode, String content,Integer billType,Integer billId,String unitName);
+    void sendText( Integer subCode, String content,Integer billType,Integer billId,String unitName);
 
     /**
      * hash 上链
      * @param subCode 业务代码编号
      * @param content 内容哈希，256bits hex编码。 方法可参考本模块HexUtil，方法内已转换，直接传入内容即可
      */
-    BcHash sendHash(Integer systemId, Integer subCode, String content);
+    BcHash sendHash( Integer subCode, String content);
 
     /**
      * 记录查询
      * @param recordId 记录id
      * @return fr
      */
-    BcRecord fetchRecord(Integer systemId, Integer subCode, String recordId);
+    BcRecord fetchRecord( Integer subCode, String recordId);
 
     /**
      * 文本追加更新
@@ -45,7 +44,7 @@ public interface BlockService {
      * @param recordId 本条记录上次上链或追加返回的记录id， 确保顺序追加
      * @return bc
      */
-    BcText appendText(Integer systemId,Integer subCode,String content, String recordId);
+    BcText appendText(Integer subCode,String content, String recordId);
 
 
     /**
@@ -54,7 +53,7 @@ public interface BlockService {
      * @param recordId 本条记录上次上链或追加返回的记录id， 确保顺序追加
      * @return bc
      */
-    BcHash appendHash(Integer systemId,Integer subCode,String content, String recordId);
+    BcHash appendHash(Integer subCode,String content, String recordId);
 
     /**
      * 哈希防篡改校验
@@ -62,7 +61,7 @@ public interface BlockService {
      * @param recordId 记录id
      * @return bc
      */
-    BcVerify verifyHash(Integer systemId, Integer subCode, String content, String recordId);
+    BcVerify verifyHash( Integer subCode, String content, String recordId);
 
     /**
      * 文本防篡改校验
@@ -70,11 +69,11 @@ public interface BlockService {
      * @param recordId 记录id
      * @return bc
      */
-    BcVerify verifyText(Integer systemId,Integer subCode,String content, String recordId);
+    BcVerify verifyText(Integer subCode,String content, String recordId);
 
     /**
      * 查询记录在各节点上链状态
      */
-    BcDeposit depositStatus(Integer systemId,Integer subCode,String recordID);
+    BcDeposit depositStatus(Integer subCode,String recordID);
 
 }

dev-block/src/main/java/com/tykj/dev/device/block/service/impl/BlockServiceImpl.java

@@ -31,9 +31,10 @@ public class BlockServiceImpl implements BlockService {
     @Autowired
     BlockDataService blockDataService;
 
+    private Integer systemId=2;
 
     @Override
-    public BcRegister subRegister(Integer systemId, String subName) {
+    public BcRegister subRegister( String subName) {
 
         SortedMap<Object, Object> request = getRequest();
         request.put("systemId", systemId);
@@ -47,7 +48,7 @@ public class BlockServiceImpl implements BlockService {
     }
 
     @Override
-    public void sendText(Integer systemId, Integer subCode, String content,Integer billType,Integer billId,String unitName) {
+    public void sendText( Integer subCode, String content,Integer billType,Integer billId,String unitName) {
         SortedMap<Object, Object> request = getRequest();
         request.put("systemId", systemId);
         request.put("subCode", subCode);
@@ -74,7 +75,7 @@ public class BlockServiceImpl implements BlockService {
     }
 
     @Override
-    public BcHash sendHash(Integer systemId, Integer subCode, String content) {
+    public BcHash sendHash( Integer subCode, String content) {
         SortedMap<Object, Object> request = getRequest();
         request.put("systemId", systemId);
         request.put("subCode", subCode);
@@ -87,7 +88,7 @@ public class BlockServiceImpl implements BlockService {
     }
 
     @Override
-    public BcRecord fetchRecord(Integer systemId, Integer subCode, String recordId) {
+    public BcRecord fetchRecord(Integer subCode, String recordId) {
         SortedMap<Object, Object> request = getRequest();
         request.put("systemId", systemId);
         request.put("subCode", subCode);
@@ -100,7 +101,7 @@ public class BlockServiceImpl implements BlockService {
     }
 
     @Override
-    public BcText appendText(Integer systemId, Integer subCode, String content, String recordId) {
+    public BcText appendText( Integer subCode, String content, String recordId) {
         SortedMap<Object, Object> request = getRequest();
         request.put("systemId", systemId);
         request.put("subCode", subCode);
@@ -115,7 +116,7 @@ public class BlockServiceImpl implements BlockService {
     }
 
     @Override
-    public BcHash appendHash(Integer systemId, Integer subCode, String content, String recordId) {
+    public BcHash appendHash( Integer subCode, String content, String recordId) {
         SortedMap<Object, Object> request = getRequest();
         request.put("systemId", systemId);
         request.put("subCode", subCode);
@@ -130,7 +131,7 @@ public class BlockServiceImpl implements BlockService {
     }
 
     @Override
-    public BcVerify verifyHash(Integer systemId, Integer subCode, String content, String recordId) {
+    public BcVerify verifyHash( Integer subCode, String content, String recordId) {
         SortedMap<Object, Object> request = getRequest();
         request.put("systemId", systemId);
         request.put("subCode", subCode);
@@ -145,7 +146,7 @@ public class BlockServiceImpl implements BlockService {
     }
 
     @Override
-    public BcVerify verifyText(Integer systemId, Integer subCode, String content, String recordId) {
+    public BcVerify verifyText( Integer subCode, String content, String recordId) {
         SortedMap<Object, Object> request = getRequest();
         request.put("systemId", systemId);
         request.put("subCode", subCode);
@@ -160,7 +161,7 @@ public class BlockServiceImpl implements BlockService {
     }
 
     @Override
-    public BcDeposit depositStatus(Integer systemId, Integer subCode, String recordID) {
+    public BcDeposit depositStatus( Integer subCode, String recordID) {
         SortedMap<Object, Object> request = getRequest();
         request.put("systemId", systemId);
         request.put("subCode", subCode);

dev-blockcha/src/main/java/com/tykj/dev/blockcha/subject/service/BlockChainUtil.java

@@ -99,7 +99,6 @@ public interface BlockChainUtil {
 
     /**
      * 文本追加更新
-     *
      * @param content  内容文本，上限为200KB
      * @param recordId 本条记录上次上链或追加返回的记录id， 确保顺序追加
      * @return bc
@@ -108,7 +107,6 @@ public interface BlockChainUtil {
 
     /**
      * 文本追加更新
-     *
      * @param content  内容文本，上限为200KB
      * @param recordId 本条记录上次上链或追加返回的记录id， 确保顺序追加
      * @return bc
@@ -117,7 +115,6 @@ public interface BlockChainUtil {
 
     /**
      * 哈希追加更新
-     *
      * @param content  内容哈希，256bits hex编码，方法内已转换，直接传入内容即可
      * @param recordId 本条记录上次上链或追加返回的记录id， 确保顺序追加
      * @return bc
@@ -126,7 +123,6 @@ public interface BlockChainUtil {
 
     /**
      * 哈希追加更新
-     *
      * @param content  内容哈希，256bits hex编码，方法内已转换，直接传入内容即可
      * @param recordId 本条记录上次上链或追加返回的记录id， 确保顺序追加
      * @return bc
@@ -135,7 +131,6 @@ public interface BlockChainUtil {
 
     /**
      * 哈希防篡改校验
-     *
      * @param content  内容哈希，256bits hex编码,直接传内容即可
      * @param recordId 记录id
      * @return bc
@@ -144,7 +139,6 @@ public interface BlockChainUtil {
 
     /**
      * 文本防篡改校验
-     *
      * @param content  内容文本，上限为200KB
      * @param recordId 记录id
      * @return bc

dev-config/src/main/java/com/tykj/dev/config/UnifiedReturnConfig.java

@@ -42,7 +42,6 @@ public class UnifiedReturnConfig implements ResponseBodyAdvice<Object> {
         if (isVoid || isResultObj || isStream) {
             return body;
         }
-
         ResultObj<Object> result = new ResultObj<>(body, "成功");
 
 //         如果返回的是字符串，则要对其做JSON序列化

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/task/ConfirmCheckTask.java

@@ -57,17 +57,17 @@ public class ConfirmCheckTask implements CommandLineRunner {
 //        historyCheckDeviceService.fixHistoryDevice();
 //        log.info("[check] 纠正核查历史装备数据完成，用时:{}ms", System.currentTimeMillis() - start);
 
-        log.info("[check] 启动加载完结的账单信息");
-        long startTime = System.currentTimeMillis();
-
-        List<Task> tasks = taskDao.findAllByBusinessTypeAndBillStatusNotIn(8, Arrays.asList(140, 160));
-
-
-        for (Task task : tasks) {
-            executor.execute(() -> extracted(task.getBillId()));
-        }
-
-        log.info("[check] 加载账单快照用时:{}ms", System.currentTimeMillis() - startTime);
+//        log.info("[check] 启动加载完结的账单信息");
+//        long startTime = System.currentTimeMillis();
+//
+//        List<Task> tasks = taskDao.findAllByBusinessTypeAndBillStatusNotIn(8, Arrays.asList(140, 160));
+//
+//
+//        for (Task task : tasks) {
+//            executor.execute(() -> extracted(task.getBillId()));
+//        }
+
+//        log.info("[check] 加载账单快照用时:{}ms", System.currentTimeMillis() - startTime);
 
 
     }

dev-destroy/pom.xml

@@ -20,6 +20,12 @@
             <groupId>com.tykj</groupId>
             <artifactId>dev-apply</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.tykj</groupId>
+            <artifactId>dev-block</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>com.tykj</groupId>
             <artifactId>dev-task</artifactId>

dev-destroy/src/main/java/com/tykj/dev/device/destroy/service/DeviceDestroyBillService.java

 package com.tykj.dev.device.destroy.service;
 
 
+import com.tykj.dev.device.block.entity.vo.BlockTraceabilityParsing;
 import com.tykj.dev.device.destroy.entity.domain.DeviceDestroyBill;
 import com.tykj.dev.device.destroy.entity.vo.DestroySelectVo;
 import com.tykj.dev.device.file.entity.FileRet;
@@ -43,4 +44,8 @@ public interface DeviceDestroyBillService {
     Page<DeviceDestroyBill> findPageDeviceDestroyBill(DestroySelectVo destroySelectVo);
 
     Map<String, List<FileRet>> findByIdToFileMapList(Integer id);
+
+    boolean checkTrueData(Integer billId);
+
+    BlockTraceabilityParsing traceabilityParsing(Integer billId);
 }

dev-destroy/src/main/java/com/tykj/dev/device/destroy/service/Impl/DeviceDestroyBillServiceImpl.java

 package com.tykj.dev.device.destroy.service.Impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.wenhao.jpa.PredicateBuilder;
 import com.github.wenhao.jpa.Specifications;
 import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
 import com.tykj.dev.config.base.FileName;
+import com.tykj.dev.device.block.entity.BlockData;
+import com.tykj.dev.device.block.entity.bc.BcRecord;
+import com.tykj.dev.device.block.entity.vo.BlockTraceabilityParsing;
+import com.tykj.dev.device.block.entity.vo.TraceabilityParsingData;
+import com.tykj.dev.device.block.service.BlockDataService;
+import com.tykj.dev.device.block.service.BlockService;
 import com.tykj.dev.device.destroy.entity.domain.DeviceDestroyBill;
 import com.tykj.dev.device.destroy.entity.vo.DestroySelectVo;
 import com.tykj.dev.device.destroy.repository.DeviceDestroyBillDao;
@@ -17,10 +25,14 @@ import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.library.subject.vo.ScriptSaveVo;
 import com.tykj.dev.device.user.subject.service.UnitsService;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
+import com.tykj.dev.misc.base.BlockBusinessEnum;
+import com.tykj.dev.misc.base.BusinessEnum;
 import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.exception.ApiException;
 import com.tykj.dev.misc.utils.DeviceSeqUtil;
 import com.tykj.dev.misc.utils.JacksonUtil;
+import com.tykj.dev.misc.utils.StringSplitUtil;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -46,6 +58,9 @@ public class DeviceDestroyBillServiceImpl implements DeviceDestroyBillService {
     @Autowired
     private UserPublicService userService;
 
+    @Autowired
+    BlockService blockService;
+
     @Autowired
     UnitsService unitsService;
 
@@ -59,19 +74,30 @@ public class DeviceDestroyBillServiceImpl implements DeviceDestroyBillService {
     DeviceLibraryDao deviceLibraryDao;
 
 
+    @Autowired
+    BlockDataService blockDataService;
+
     @Override
     public DeviceDestroyBill saveDeviceDestroyBill(DeviceDestroyBill scrap) {
-        CompletableFuture.runAsync(()-> {
-        if (scrap.getRecordId() == null || scrap.getRecordId().equals("")) {
-            scrap.setRecordId(blockChainUtil.sendText(1000, JacksonUtil.toJSon(scrap)).getData().getRecordID());
-            deviceDestroyBillDao.save(scrap);
-            log.info("[销毁]上链数据时间本次");
-        } else {
-            scrap.setRecordId(blockChainUtil.appendText(JacksonUtil.toJSon(scrap), scrap.getRecordId()).getData().getRecordID());
-            deviceDestroyBillDao.save(scrap);
+        DeviceDestroyBill save = deviceDestroyBillDao.save(scrap);
+        sendText(save.getId());
+        return save;
+    }
+
+
+    /**
+     * 根据id查询上链信息放回上链实体
+     */
+    private DeviceDestroyBill queryScrapId(Integer scrapId){
+        Optional<DeviceDestroyBill> byId = deviceDestroyBillDao.findById(scrapId);
+        if (byId.isPresent()){
+            DeviceDestroyBill deviceDestroyBill=byId.get();
+            deviceDestroyBill.setScripts(JacksonUtil.readValue(deviceDestroyBill.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {}));
+            return deviceDestroyBill;
+        }else {
+            throw new ApiException("[销毁] 根据id查询上链信息失败："+scrapId);
         }
-    });
-        return deviceDestroyBillDao.save(scrap);
+
     }
 
     @Override
@@ -149,6 +175,69 @@ public class DeviceDestroyBillServiceImpl implements DeviceDestroyBillService {
         }
         predicateBuilder.eq("destroyStatus", StatusEnum.END.id);
         return predicateBuilder.build();
+    }
+
+    /**
+     * 验证接口
+     */
+    @Override
+    public BlockTraceabilityParsing traceabilityParsing(Integer billId) {
+        BlockData billTypeAndBillId = blockDataService.findBillTypeAndBillId(BusinessEnum.DESTROY.id, billId);
+        BcRecord bcRecord = blockService.fetchRecord( BlockBusinessEnum.DESTROY.subCode, billTypeAndBillId.getRecordID());
+        DeviceDestroyBill deviceDestroyBill = queryScrapId(billId);
+        DeviceDestroyBill deviceDestroyBill1 = JSON.parseObject(bcRecord.getData().getContent(), DeviceDestroyBill.class);
+        BlockTraceabilityParsing blockTraceabilityParsing = bcRecord.getData().toBlockTraceabilityParsing();
+        blockTraceabilityParsing.setBusinessTraceabilityParsingData(TraceabilityParsingData.builder()
+                .billTypeName("销毁")
+                .carrierIds(StringSplitUtil.stringListToString(deviceDestroyBill.getScripts().stream().map(ScriptSaveVo::getSeqNumber).collect(Collectors.toList())))
+                .unitName(deviceDestroyBill.getUnitName())
+                .documentNo(deviceDestroyBill.getNum())
+                .operationTime(deviceDestroyBill.getDestroyTime())
+                .operatorUserName(operatorName(deviceDestroyBill))
+                .build());
+
+        blockTraceabilityParsing.setBlockTraceabilityParsingData(TraceabilityParsingData.builder()
+                .billTypeName("销毁")
+                .carrierIds(StringSplitUtil.stringListToString(deviceDestroyBill1.getScripts().stream().map(ScriptSaveVo::getSeqNumber).collect(Collectors.toList())))
+                .unitName(deviceDestroyBill1.getUnitName())
+                .documentNo(deviceDestroyBill1.getNum())
+                .operationTime(deviceDestroyBill1.getDestroyTime())
+                .operatorUserName(operatorName(deviceDestroyBill1))
+                .build());
+        blockTraceabilityParsing.setBlockData(deviceDestroyBill1);
+        blockTraceabilityParsing.setCurrentData(deviceDestroyBill);
+        return blockTraceabilityParsing;
+    }
+
+    private String operatorName(DeviceDestroyBill deviceDestroyBill) {
+
+        StringBuffer buf = new StringBuffer();
+        buf.append(deviceDestroyBill.getSupervisor())
+                .append(",")
+                .append(deviceDestroyBill.getLeader())
+                .append(",")
+                .append(deviceDestroyBill.getUndertaker())
+                .append(",")
+                .append(deviceDestroyBill.getAgent());
+        return buf.toString();
+
+    }
+
+    //验真
+
+    @Override
+    public boolean checkTrueData(Integer billId) {
+        BlockTraceabilityParsing blockTraceabilityParsing = traceabilityParsing(billId);
+        boolean contrast = blockDataService.contrast(blockTraceabilityParsing);
+        return contrast;
+    }
+
 
+    /**
+     * 上链接口
+     */
+    public void sendText(Integer id){
+        DeviceDestroyBill deviceDestroyBill = queryScrapId(id);
+        blockService.sendText(BlockBusinessEnum.DESTROY.subCode, JSON.toJSONStringWithDateFormat(deviceDestroyBill,"yyyy-MM-dd HH:mm:ss", SerializerFeature.WriteDateUseDateFormat), BusinessEnum.DESTROY.id,id,deviceDestroyBill.getUnitName());
     }
 }

dev-screen/pom.xml

@@ -37,6 +37,11 @@
             <groupId>com.tykj</groupId>
             <artifactId>dev-user</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.tykj</groupId>
+            <artifactId>dev-train</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.tykj.dev</groupId>
             <artifactId>misc</artifactId>

dev-screen/src/main/java/com/tykj/dev/device/screen/subject/service/impl/ScreeServiceImpl.java

@@ -22,6 +22,8 @@ import com.tykj.dev.device.sendback.service.RepelQueryService;
 import com.tykj.dev.device.storage.repository.StorageBillDao;
 import com.tykj.dev.device.task.repository.TaskDao;
 import com.tykj.dev.device.task.subject.domin.Task;
+import com.tykj.dev.device.train.dao.OnlineTainUserTimeDao;
+import com.tykj.dev.device.train.dao.TrainUserDao;
 import com.tykj.dev.device.user.cache.UnitsCache;
 import com.tykj.dev.device.user.cache.UserCache;
 import com.tykj.dev.device.user.subject.dao.UnitsDao;
@@ -103,6 +105,12 @@ public class ScreeServiceImpl implements ScreeService {
     @Autowired
     RepelQueryService repelQueryService;
 
+    @Autowired
+    TrainUserDao trainUserDao;
+
+    @Resource
+    OnlineTainUserTimeDao onlineTainUserTimeDao;
+
     @Override
     public Map<String, Object> getScreeAroundData() {
 
@@ -121,6 +129,10 @@ public class ScreeServiceImpl implements ScreeService {
 
         //todo --zjm 人员管理
         long count = userCache.findAll().stream().filter(user -> user.getPosition() != 2).count();
+        //培训人次
+        long IsSignU = trainUserDao.countByIsSignUp(1);
+        //学习人次
+        long count1 = onlineTainUserTimeDao.count();
 
         //左边第三个(ZB库存)
 //        List<Map<String, Object>> leftThree = deviceLibraryDao.getInCountByUnit();

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/controller/SelfCheckController.java

@@ -1224,5 +1224,56 @@ public class SelfCheckController {
 //        Map<String, Object> detail = selfCheckBillService.selectDetail(billId);
 //        return ResultUtil.success(detail);
 //    }
+    @ApiOperation(value = "test", notes = "解析二维码")
+    @PostMapping(value = "/test1")
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseEntity parseCode(@RequestBody List<String> strings) {
+        List<Units> unitsList = unitsDao.findAll();
+        unitsList.forEach(units -> {
+            //添加账单
+            SelfCheckBill selfCheckBill = new SelfCheckBill();
+            selfCheckBill.setCheckStatus(3);
+            selfCheckBill.setCheckUnit(units.getName());
+            selfCheckBill.setCheckUnitId(units.getUnitId());
+            //add zsp
+            selfCheckBill.setStorageLocationId(0);
+            StringBuffer title = new StringBuffer();
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(new Date());
+            int year = calendar.get(Calendar.YEAR);
+            int month = calendar.get(Calendar.MONTH)+1;
+            title.append("系统发起定时"+units.getName());
+            title.append(year).append("年");
+            title.append(month).append("月自查任务");
+
+                selfCheckBill.setCycle(1);
+
+//                    if (cron.equals(cron1)){
+//                        title.append(month).append("月自查任务");
+//                        selfCheckBill.setCycle(1);
+//                    }
+//                    else if (cron.equals(cron2)){
+//                        title.append(getQuarter(month)).append("自查任务");
+//                        selfCheckBill.setCycle(2);
+//                    }
+//                    else if (cron.equals(cron3)){
+//                        title.append("自查任务");
+//                        selfCheckBill.setCycle(3);
+//                    }
+//                    else {
+//                        title.append("自查任务");
+//                        selfCheckBill.setCycle(0);
+//                    }
+            selfCheckBill.setTitle(title.toString());
+            SelfCheckBill selfCheckBill1 = selfCheckBillService.addEntity(selfCheckBill);
+            //发起待自查任务
+            List<Integer> userIds = new ArrayList<>();
+            userIds.add(0);
+            TaskBto taskBto = new TaskBto(StatusEnum.WAIT_SELF_CHECK.id,title.toString(),null,".",selfCheckBill1.getId(),4,units.getUnitId(),0,null,userIds);
+            taskService.start(taskBto);
+        });
+
+        return ResultUtil.success("1");
+    }
 
 }

dev-task/src/main/java/com/tykj/dev/device/task/service/TaskService.java

@@ -265,7 +265,6 @@ public interface TaskService {
      */
     List<Task> findByBillIdAndBusinessType(Integer billId, Integer businessType);
 
-
     /**
      * 根据taskId删除task
      * @param taskId  任务id
@@ -276,4 +275,5 @@ public interface TaskService {
      * 根据父id查询任务
      */
     Task findByParentId(Integer parentTaskId);
+
 }

dev-train/src/main/java/com/tykj/dev/device/train/dao/OnlineTainUserTimeDao.java

@@ -8,4 +8,5 @@ import java.util.Optional;
 
 public interface OnlineTainUserTimeDao extends JpaRepository<OnlineTainUserTime, Integer>, JpaSpecificationExecutor<OnlineTainUserTime> {
     Optional<OnlineTainUserTime> findByUserIdAndTrainId(Integer userId, Integer trainId);
+
 }

dev-train/src/main/java/com/tykj/dev/device/train/dao/TrainUserDao.java

@@ -31,4 +31,6 @@ public interface TrainUserDao extends JpaRepository<TrainUser, Integer>, JpaSpec
     @Query("update TrainUser o set o.recordId = :recordId  where o.id =:id")
     int upDate(String recordId,Integer id);
 
+    long countByIsSignUp(Integer signUp);
+
 }