[file user 培训 清退] bug以及新增

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

+package com.tykj.dev.device.file.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName WorkHandoverDevice.java
+ * @Description TODO
+ * @createTime 2021年03月08日 10:40:00
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@ApiModel(value = "工作交接单据", description = "工作交接单据提供数据")
+public class WorkHandoverDevice {
+
+    @ApiModelProperty(value = "型号", example = "bmxx")
+    public String model;
+
+    @ApiModelProperty(value = "名称", example = "BM-1")
+    public String name;
+
+    @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 = "序列号区间")
+    public String seqs;
+}

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

+package com.tykj.dev.device.file.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName WorkHandoverDoc.java
+ * @Description TODO
+ * @createTime 2021年03月08日 10:18:00
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@ApiModel(value = "工作交接单据数据对象", description = "工作交接单据提供数据")
+public class WorkHandoverDoc {
+
+    @ApiModelProperty(name = "时间")
+    private Date time;
+
+    @ApiModelProperty(name = "装备数据集合")
+    private List<WorkHandoverDevice> workHandoverDeviceList;
+}

dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java

@@ -199,7 +199,7 @@ public class JavaToPdfHtmlFreeMarker {
         data.put("page",page);
         data.put("count",count);
         if (documents.getSrcA()==null||documents.getSrcA().equals("")){
-            data.put("srcA"," ");
+            data.put("srcA","1");
             data.put("nameA"," ");
         }else {
             data.put("srcA","\""+documents.getSrcA()+"\"");
@@ -207,10 +207,10 @@ public class JavaToPdfHtmlFreeMarker {
         }
 
         if (documents.getSrcB()==null||documents.getSrcB().equals("")){
-            data.put("srcB"," ");
+            data.put("srcB","\""+1+"\"");
             data.put("nameB"," ");
         }else {
-            data.put("srcB","\""+documents.getSrcA()+"\"");
+            data.put("srcB","\""+documents.getSrcB()+"\"");
             data.put("nameB",documents.getNameB());
         }
         List<DocumentDevice> list1=new ArrayList<>();
@@ -571,7 +571,6 @@ public class JavaToPdfHtmlFreeMarker {
                 lists.add(list);
             }
         }
-        System.out.println("hah");
         return lists;
 
     }

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/domain/DeviceRepelDetail.java

@@ -101,13 +101,13 @@ public class DeviceRepelDetail extends BaseEntity {
      * 经办人 名称
      */
     @ApiModelProperty(value = "发件方名称(A岗位)")
-    private String senderUsera;
+    private String senderUserA;
 
     /**
      * 签发人
      */
     @ApiModelProperty(value = "签发人(B岗位)")
-    private String senderUserb;
+    private String senderUserB;
 
     /**
      * 签发人

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/OrderOutData.java

@@ -77,13 +77,13 @@ public class OrderOutData {
      * 经办人 名称
      */
     @ApiModelProperty(value = "发件方名称(A岗位)")
-    private String senderUsera;
+    private String senderUserA;
 
     /**
      * 签发人
      */
     @ApiModelProperty(value = "签发人(B岗位)")
-    private String senderUserb;
+    private String senderUserB;
 
     /**
      * 签发人

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

@@ -92,7 +92,7 @@ public class WorkHandoverServiceImpl implements WorkHandoverService {
             throw new ApiException(ResponseEntity.status(500).body("未找到id为" + workHandoverEndAddVo.getWorkHandoverId() + " 工作交接业务"));
         }
         workHandover.setStatus(2);
-        workHandover.setFile(JacksonUtil.toJSon(workHandoverEndAddVo.getFileLists()));
+        workHandover.setFile(FilesUtil.stringFileToList(workHandoverEndAddVo.getFileLists()));
         workHandover = workHandoverDao.save(workHandover);
         //把移交人的所有代办任务和跟踪任务替换名称，换成交接人
 //        taskService.workHandover(workHandover.getHandoverUserAId(), workHandover.getTurnOverUserAId());

dev-union/src/main/resources/bill.html

@@ -377,7 +377,7 @@
                                             <span><span style="color: #fff;">1234</span>年<span style="color: #fff;">0121</span>月<span style="color: #fff;">0232</span>日</span>
                                             <div class="rightImg">
                                                 <div id="pos1" >
-                                                    <img style="width:80px;height:80px" src=${srcB} class="" id=""/>
+                                                    <img style="width:80px;height:80px" src=${srcB}/>
                                                 </div>
                                             </div>
                                         </span>

dev-union/src/main/resources/bill1.html

@@ -152,7 +152,7 @@
         }
         .returnTablePrint .line3{
             width: 100%;
-            height: 80px;
+            height: 70px;
             /* box-sizing: border-box; */
             /*height:150px;*/
             /*display: flex;*/
@@ -165,7 +165,7 @@
             box-sizing: border-box;
             /*padding-left: 20px;*/
             position: relative;
-            line-height: 80px;
+            line-height: 70px;
         }
         .returnTablePrint .line3 .left{
             border-right: 1px solid #7f7f7f;

dev-user/src/main/java/com/tykj/dev/device/user/config/MyUserDetailsServiceImpl.java

@@ -7,6 +7,7 @@ import com.tykj.dev.device.user.subject.entity.UserRole;
 import com.tykj.dev.device.user.subject.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -35,15 +36,15 @@ public class MyUserDetailsServiceImpl implements UserDetailsService {
     private RolePermissionsService rolePermissionsService;
 
     @Override
-    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+    public UserDetails loadUserByUsername(String username) throws BadCredentialsException {
 
         SecurityUser securityUser = new SecurityUser();
         User user = userService.findByUserName(username);
         if (user == null) {
-            throw new UsernameNotFoundException("用户名不正确");
+            throw new BadCredentialsException("用户名填写错误");
         } else {
             if (user.getIsDel()==1){
-                throw new UsernameNotFoundException("账号已冻结，请联系管理人员");
+                throw new BadCredentialsException("账号被冻结，请联系管理人员");
             }
             List<UserRole> userRoles = userRoleService.findByUserId(user.getUserId());
             List<Integer> roleIds = new ArrayList<>();

dev-user/src/main/java/com/tykj/dev/device/user/config/handler/MyFailHandler.java

@@ -19,10 +19,10 @@ public class MyFailHandler implements AuthenticationFailureHandler {
 
     @Override
     public void onAuthenticationFailure(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, AuthenticationException e) throws IOException, ServletException {
-        log.error("[登录模块] 登录发生异常 : {}", e.toString());
+        log.error("[登录模块] 登录发生异常 : {}",e.getMessage());
         httpServletResponse.setStatus(200);
         httpServletResponse.setCharacterEncoding("utf-8");
         httpServletResponse.setContentType("application/json");
-        httpServletResponse.getWriter().println("{\"code\":401,\"msg\":\"用户登陆失败\"}");
+        httpServletResponse.getWriter().println("{\"code\":401,\"msg\":\""+e.getMessage()+"\"}");
     }
 }

dev-usereport/src/main/java/com/tykj/dev/device/usereport/controller/DeviceUseReportController.java

@@ -24,6 +24,9 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.*;
 
 /**
@@ -81,13 +84,13 @@ public class DeviceUseReportController {
         ResultObj resultObj = (ResultObj) selectDetail(id).getBody();
         DeviceUseReportDetailVo deviceUseReportDetailVo = (DeviceUseReportDetailVo) resultObj.getData();
         WrodParameter wrodParameter = new WrodParameter();
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(Objects.requireNonNull(deviceUseReportDetailVo).getCreateTime());
-        StringBuffer stringBuffer = new StringBuffer();
-        stringBuffer.append(calendar.get(Calendar.YEAR)).append("年").append(calendar.get(Calendar.MONTH)).append("月").append(calendar.get(Calendar.DAY_OF_MONTH)).append("日");
-        wrodParameter.setTime(stringBuffer.toString());
+
+        Instant instant = deviceUseReportDetailVo.getCreateTime().toInstant();
+        ZoneId zone = ZoneId.systemDefault();
+        LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, zone);
+        wrodParameter.setTime(localDateTime.getYear()+"年"+localDateTime.getMonth()+"月"+localDateTime.getMonthValue()+"日");
         wrodParameter.setUnitsName(deviceUseReportDetailVo.getUnit());
-        wrodParameter.setTitle1(calendar.get(Calendar.YEAR) + "年度" + deviceUseReportDetailVo.getUnit());
+        wrodParameter.setTitle1(localDateTime.getYear() + "年度" + deviceUseReportDetailVo.getUnit()+"装备使用情况报告");
         wrodParameter.setTitle2("装备使用情况报告");
         wrodParameter.setSelfCheck("列装库内列装总数：" + deviceUseReportDetailVo.getPackingNum().toString() + ",退装总数：" + deviceUseReportDetailVo.getRetiredNum().toString() + "。");
         wrodParameter.setComfirmCheck(" ");