[user file] 代码添加

dev-file/pom.xml

@@ -12,11 +12,12 @@
     <artifactId>dev-file</artifactId>
     <dependencies>
         <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>itextpdf</artifactId>
-            <version>5.5.10</version>
+            <groupId>org.xhtmlrenderer</groupId>
+            <artifactId>flying-saucer-pdf</artifactId>
+            <version>9.1.5</version>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/org.xhtmlrenderer/flying-saucer-pdf-itext5 -->
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>

dev-file/src/main/java/com/tykj/dev/device/file/Controller/FileController.java

@@ -56,8 +56,20 @@ public class FileController {
     @PostMapping("/printDocuments")
     public ResponseEntity printDocuments(@RequestBody Documents documents) throws IOException, DocumentException {
         String[] content = JavaToPdfHtmlFreeMarker.freeMarkerRender(documents,url+"htmlModel/");
-        log.info("[file] 调用了生成出入单据对接口");
-        return ResponseEntity.ok(JavaToPdfHtmlFreeMarker.createPdf(content,url,preview));
+        log.info("[file] 调用了生成出入单据对接口 documents");
+        return ResponseEntity.ok(JavaToPdfHtmlFreeMarker.createPdf(content,url,preview,"documents/"));
+    }
+
+    /**
+     * 生成工作交接的单据
+     * @return
+     */
+    @ApiOperation(value = "生成工作交接的单据")
+    @PostMapping("/wordHandover")
+    public ResponseEntity wordHandover(@RequestBody WorkHandoverDoc workHandoverDoc) {
+        String[] content = JavaToPdfHtmlFreeMarker.freeMarkerRenderWorkHandover(workHandoverDoc,url+"htmlModel/");
+        log.info("[file] 生成工作交接的单据");
+        return ResponseEntity.ok(JavaToPdfHtmlFreeMarker.createPdf(content,url,preview,"workHandover/"));
     }
 
     /**
@@ -68,8 +80,8 @@ public class FileController {
     @PostMapping("/printConfirm")
     public ResponseEntity printConfirm(@RequestBody Confirm confirm) {
         String[] content = JavaToPdfHtmlFreeMarker.freeMarkerRenderConfirm(confirm,url+"htmlModel/");
-        log.info("[file] 调用了生成确认单据对接口");
-        return ResponseEntity.ok(JavaToPdfHtmlFreeMarker.createPdfConfirm(content,url,preview));
+        log.info("[file] 调用了生成确认单据对接口 confirm");
+        return ResponseEntity.ok(JavaToPdfHtmlFreeMarker.createPdf(content,url,preview,"confirm/"));
     }
 
     /**
@@ -81,7 +93,7 @@ public class FileController {
     public ResponseEntity printDestruction(@RequestBody Destruction destruction){
         String[] content = JavaToPdfHtmlFreeMarker.freeMarkerRenderDestruction(destruction,url+"htmlModel/");
         log.info("[file] 调用了生成销毁单据对接口");
-        return ResponseEntity.ok(JavaToPdfHtmlFreeMarker.createPdfDestruction(content,url,preview));
+        return ResponseEntity.ok(JavaToPdfHtmlFreeMarker.createPdf(content,url,preview,"destruction/"));
     }
 
     /**
@@ -114,7 +126,7 @@ public class FileController {
         documents.setDocumentDevices(documentDevices);
 
         String[] content = JavaToPdfHtmlFreeMarker.freeMarkerRender(documents,url+"htmlModel/");
-        showPdf(response,JavaToPdfHtmlFreeMarker.createPdf(content,url,preview).getFilePath());
+        showPdf(response,JavaToPdfHtmlFreeMarker.createPdf(content,url,preview,"documents/").getFilePath());
         return ResponseEntity.ok("ok");
     }
 

dev-file/src/main/java/com/tykj/dev/device/file/entity/WorkHandoverDevice.java

@@ -2,6 +2,7 @@ package com.tykj.dev.device.file.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -19,11 +20,14 @@ import lombok.NoArgsConstructor;
 @ApiModel(value = "工作交接单据", description = "工作交接单据提供数据")
 public class WorkHandoverDevice {
 
+    @ApiModelProperty(value = "序列号" ,example = "1")
+    private Integer code;
+
     @ApiModelProperty(value = "型号", example = "bmxx")
-    public String model;
+    private String model;
 
     @ApiModelProperty(value = "名称", example = "BM-1")
-    public String name;
+    private String name;
 
     @ApiModelProperty(value = "装备类型总数", example = "100")
     private Integer deviceNumber;
@@ -49,6 +53,13 @@ public class WorkHandoverDevice {
     @ApiModelProperty(value = "使用数量", example = "10")
     private Integer useNum;
 
+    @ApiModelProperty(value = "其他数据",example = "10")
+    private Integer otherNum=0;
+
     @ApiModelProperty(value = "序列号区间")
     public String seqs;
+
+    public Integer getLen(){
+        return seqs.length();
+    }
 }

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelQueryServiceImpl.java

@@ -47,9 +47,9 @@ public class RepelQueryServiceImpl implements RepelQueryService {
     RepelDeviceUnitService deviceUnitService;
     @Override
     public RepelStatisticsVo findRepelTaskStatisticals(Integer taskId, Integer billId) {
-       DeviceRepelDetail deviceRepelDetail=  repelDetailService.findDeviceRepelDetailNoDev(billId);
-       DeviceRepel deviceRepel=deviceRepelService.findDeviceRepel(deviceRepelDetail.getRepelId());
-       return new RepelStatisticsVo(deviceRepel.getInitiateName(),deviceRepel.getTime(),repelTaskStatisticalService.findAllRepelTaskStatistical(taskId,deviceRepelDetail.getRepelId()));
+//       DeviceRepelDetail deviceRepelDetail=  repelDetailService.findDeviceRepelDetailNoDev(billId);
+       DeviceRepel deviceRepel=deviceRepelService.findDeviceRepel(billId);
+       return new RepelStatisticsVo(deviceRepel.getInitiateName(),deviceRepel.getTime(),repelTaskStatisticalService.findAllRepelTaskStatistical(taskId,billId));
     }
 
     @Override

dev-train/src/main/java/com/tykj/dev/device/train/controller/HandoverController.java

@@ -14,6 +14,8 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.stream.Collectors;
+
 /**
  * @author zjm
  * @version 1.0.0
@@ -80,4 +82,15 @@ public class HandoverController {
         return ResponseEntity.ok(workHandoverService.handover(workHandoverAddVo.getTurnOverUserAId()));
     }
 
+    /**
+     * 工作交接-查询交接人下拉
+     */
+    @GetMapping(value = "/userList")
+    @ApiOperation(value = "工作交接-查询交接人下拉")
+    public ResponseEntity userList(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser) {
+
+        return ResponseEntity.ok(userService.findByUniteId1(securityUser.getCurrentUserInfo().getUnitsId()).stream().filter(userShenRe -> userShenRe.getTrainStatus()!=5).collect(Collectors.toList()));
+    }
+
+
 }

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

+package com.tykj.dev.device.train.dao;
+
+import com.tykj.dev.device.train.entity.WorkHandoverDev;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface WorkHandoverDevDao extends JpaRepository<WorkHandoverDev, Integer>, JpaSpecificationExecutor<WorkHandoverDev> {
+List<WorkHandoverDev> findAllByWordId(Integer wordId);
+}

dev-train/src/main/java/com/tykj/dev/device/train/entity/WorkHandover.java

@@ -11,8 +11,10 @@ import lombok.NoArgsConstructor;
 import org.modelmapper.ModelMapper;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -26,12 +28,13 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
+@EntityListeners(AuditingEntityListener.class)
 public class WorkHandover {
     /**
      * 工作交接id
      */
     @Id
-    @GeneratedValue
+    @GeneratedValue()
     @ApiModelProperty(value = "工作交接id")
     @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer workHandoverId;
@@ -84,17 +87,19 @@ public class WorkHandover {
      * 创建时间
      */
     @CreatedDate
-    private Integer createTime;
+    private  Date createTime;
 
     /**
      * 更新时间
      */
     @LastModifiedDate
-    private Integer updateTime;
+    private Date updateTime;
 
     @ApiModelProperty(value = "区块链RID",name = "recordId")
     private String recordId;
 
+
+
     /**
      * 发起用户集合
      */
@@ -112,4 +117,10 @@ public class WorkHandover {
      */
     @Transient
     private List<FileRet> fileRets;
+
+    /**
+     * 本次交接装备信息清单
+     */
+    @Transient
+    private List<WorkHandoverDev> workHandoverDevs;
 }

dev-train/src/main/java/com/tykj/dev/device/train/entity/WorkHandoverDev.java

+package com.tykj.dev.device.train.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName WorkHandoverDevice.java
+ * @Description TODO
+ * @createTime 2021年03月09日 15:52:00
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+public class WorkHandoverDev {
+
+    @Id
+    @GeneratedValue
+    @ApiModelProperty(value = "数据id")
+    private Integer id;
+
+    @ApiModelProperty(value = "业务数据id")
+    private Integer wordId;
+
+    @ApiModelProperty(value = "型号", example = "bmxx")
+    private String model;
+
+    @ApiModelProperty(value = "名称", example = "BM-1")
+    private String name;
+
+    @ApiModelProperty(value = "所属单位", example = "省机要局")
+    private String ownUnit;
+
+    @ApiModelProperty(value = "装备类型总数", example = "100")
+    private Integer deviceNumber;
+
+    @ApiModelProperty(value = "在库数量", example = "10")
+    private Integer inLibraryNum;
+
+    @ApiModelProperty(value = "维修数量", example = "10")
+    private Integer repairNum;
+
+    @ApiModelProperty(value = "销毁数量", example = "10")
+    private Integer destoryNum;
+
+    @ApiModelProperty(value = "退役数量", example = "10")
+    private Integer retiredNum;
+
+    @ApiModelProperty(value = "报废数量", example = "10")
+    private Integer scrappedNum;
+
+    @ApiModelProperty(value = "运输中数量", example = "10")
+    private Integer allotNum;
+
+    @ApiModelProperty(value = "使用数量", example = "10")
+    private Integer useNum;
+
+//    @ApiModelProperty(value = "该型号所有装备Id列表")
+//    @Transient
+//    private List<Integer> deviceIds = new ArrayList<>();
+//
+//    @Transient
+//    @ApiModelProperty(value = "该型号在库装备Id列表")
+//    private List<Integer> inLibraryIds = new ArrayList<>();
+//
+//    @Transient
+//    @ApiModelProperty(value = "该型号维修装备Id列表")
+//    private List<Integer> repairIds = new ArrayList<>();
+//
+//    @Transient
+//    @ApiModelProperty(value = "该型号销毁装备Id列表")
+//    private List<Integer> destoryIds = new ArrayList<>();
+//
+//    @Transient
+//    @ApiModelProperty(value = "该型号退役装备Id列表")
+//    private List<Integer> retiredIds = new ArrayList<>();
+//
+//    @Transient
+//    @ApiModelProperty(value = "该型号报废装备Id列表")
+//    private List<Integer> scrappedIds = new ArrayList<>();
+//
+//    @Transient
+//    @ApiModelProperty(value = "该型号运输中装备Id列表")
+//    private List<Integer> allotIds = new ArrayList<>();
+//
+//    @Transient
+//    @ApiModelProperty(value = "该型号使用中装备Id列表")
+//    private List<Integer> useIds = new ArrayList<>();
+
+    @ApiModelProperty(value = "序列号区间")
+    @Column(name = "seq_s" ,columnDefinition = "TEXT")
+    public String seqs;
+}

dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/WorkHandoverAddVo.java

 package com.tykj.dev.device.train.entity.vo;
 
+import com.tykj.dev.device.library.subject.vo.DeviceStatisticsVo;
 import com.tykj.dev.device.train.entity.WorkHandover;
-import com.tykj.dev.misc.base.BeanHelper;
+import com.tykj.dev.device.train.entity.WorkHandoverDev;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -27,6 +28,9 @@ public class WorkHandoverAddVo {
     private List<Integer> turnOverUserAId;
 
 
-
+    /**
+     * 单据装备数据统计数据
+     */
+    List<WorkHandoverDev> workHandoverDevices;
 
 }

dev-train/src/main/java/com/tykj/dev/device/train/service/impl/WorkHandoverServiceImpl.java

@@ -7,7 +7,9 @@ import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.task.subject.vo.TaskUserVo;
 import com.tykj.dev.device.train.dao.WorkHandoverDao;
+import com.tykj.dev.device.train.dao.WorkHandoverDevDao;
 import com.tykj.dev.device.train.entity.WorkHandover;
+import com.tykj.dev.device.train.entity.WorkHandoverDev;
 import com.tykj.dev.device.train.entity.vo.WorkHandoverAddVo;
 import com.tykj.dev.device.train.entity.vo.WorkHandoverEndAddVo;
 import com.tykj.dev.device.train.entity.vo.WorkHandoverVo;
@@ -29,6 +31,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collector;
@@ -59,12 +62,15 @@ public class WorkHandoverServiceImpl implements WorkHandoverService {
     @Autowired
     UnitsService unitsService;
 
+    @Autowired
+    WorkHandoverDevDao workHandoverDevDao;
+
     @Override
     public WorkHandover createWorkHandover(WorkHandoverAddVo workHandoverAddVo, SecurityUser securityUser) {
         log.info("[workHandover] 新建工作交接");
 //        WorkHandover
         List<User> users= userService.findAllByUnite(securityUser.getCurrentUserInfo().getUnitsId());
-        List<Integer> handoverIds= users.stream().map(User::getUserId).collect(Collectors.toList());
+        List<Integer> handoverIds= users.stream().filter(user -> user.getTrainStatus()!=5).map(User::getUserId).collect(Collectors.toList());
         WorkHandover workHandover=new WorkHandover();
         workHandover.setStatus(1);
         workHandover.setTurnOverUserIds(StringSplitUtil.ListToString(workHandoverAddVo.getTurnOverUserAId()));
@@ -72,6 +78,12 @@ public class WorkHandoverServiceImpl implements WorkHandoverService {
         workHandover.setInitiateUserId(securityUser.getCurrentUserInfo().getUserId());
         //创建workHandoverDB 存储数据库
         workHandover = workHandoverDao.save(workHandover);
+        Integer id=workHandover.getWorkHandoverId();
+        List<WorkHandoverDev> workHandoverDevs=workHandoverAddVo.getWorkHandoverDevices();
+        workHandoverDevs.forEach(
+                workHandoverDev -> workHandoverDev.setWordId(id)
+        );
+        workHandoverDevDao.saveAll(workHandoverDevs);
         List<Integer> integers = new ArrayList<>();
         integers.add(securityUser.getCurrentUserInfo().getUserId());
         taskService.start(new TaskBto(StatusEnum.WORKHANDOVER1011.id, "工作交接", null, null, workHandover.getWorkHandoverId(), BusinessEnum.WORK_HANDOVER.id, securityUser.getCurrentUserInfo().getUnitsId(), 0, null, integers));
@@ -114,6 +126,7 @@ public class WorkHandoverServiceImpl implements WorkHandoverService {
             workHandover.setHandoverUserList(userService.findAllUserIdInUser(StringSplitUtil.stringToList(workHandover.getHandoverUserIds())));
             workHandover.setTurnOverUserList(userService.findAllUserIdInUser(StringSplitUtil.stringToList(workHandover.getTurnOverUserIds())));
             workHandover.setFileRets(FilesUtil.stringFileToList(workHandover.getFile()));
+            workHandover.setWorkHandoverDevs(workHandoverDevDao.findAllByWordId(workHandover.getWorkHandoverId()));
             return workHandover;
         } else {
             throw new ApiException(ResponseEntity.status(500).body("没有这个id:" + workHandoverId));

dev-user/src/main/java/com/tykj/dev/device/user/subject/entity/User.java

@@ -130,7 +130,7 @@ public class User {
     private Integer position;
 
     /**
-     * 培训状态 0.已培训 1.已过期 2.未培训 3.快过期
+     * 培训状态 0.已培训 1.已过期 2.未培训 3.快过期 5.不是专管员
      */
     private Integer trainStatus=2;
     /**

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/UserService.java

@@ -42,6 +42,12 @@ public interface UserService extends PublicService<User> {
     List<UserShenRe> findByUniteId(Integer unitsId);
 
 
+    /**
+     * 根据单位ID查询人员列表（包括自己）
+     */
+    List<UserShenRe> findByUniteId1(Integer unitsId);
+
+
     /**
      * 根据单位id查询用户
      */

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UserServiceImpl.java

@@ -168,6 +168,11 @@ public class UserServiceImpl implements UserService {
         return userDao.findAllByUnitsId(unitsId).stream().map(User::toRe).sorted(Comparator.comparing(UserShenRe::getShowOrder)).collect(Collectors.toList());
     }
 
+    @Override
+    public List<UserShenRe> findByUniteId1(Integer unitsId) {
+        return userDao.findAllByUnitsId(unitsId).stream().map(User::toRe).sorted(Comparator.comparing(UserShenRe::getShowOrder)).collect(Collectors.toList());
+    }
+
     @Override
     public List<User> findAllByUnite(Integer unitsId) {
         return userDao.findAllByUnitsId(unitsId);
@@ -189,6 +194,7 @@ public class UserServiceImpl implements UserService {
         List<MemberThat> memberThats = new ArrayList<>();
         userDao.findAllByUnitsId(userConditionsVo.getUnitsId())
                 .stream()
+                .filter(user -> user.getTrainStatus()!=5)
                 .filter(user ->{
                     boolean isNull=userConditionsVo.getDim()!=null;
                     if (isNull) {
@@ -448,8 +454,8 @@ public class UserServiceImpl implements UserService {
         user.setName(notIsUser.getName());
         user.setUnitsId(notIsUser.getUnitId());
         user.setShowOrder(3);
-        user.setTrainStatus(2);
-        return user;
+        user.setTrainStatus(5);
+        return userDao.save(user);
     }
 
     @Override