接口联调

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Version.java

@@ -57,6 +57,8 @@ public class Version extends BaseEntity {
      */
     private byte[] file;
 
+    private String fileName;
+
     /**
      * 终端程序版本状态（0-停用 1-启用）
      */

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/VersionVO.java

@@ -77,6 +77,7 @@ public class VersionVO implements Serializable {
     @ApiModelProperty("终端程序版本状态（0-停用 1-启用）")
     private Integer versionFlag;
 
-
+    @ApiModelProperty("文件名称")
+    private String fileName;
 
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java

@@ -57,9 +57,10 @@ public class ProgramVersionController extends BaseController {
                                         @RequestParam("devType") String devType,
                                         @RequestParam("remark") String remark,
                                         @RequestParam(value = "versionType",required = false) String versionType,
+                                        @RequestParam("filename") String fileName,
                                         @ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file) {
         String methodDescribe = getMethodDescribe("addProgramVersion");
-        boolean res = programService.addProgramVersion(name,protocol,date,devType,remark,versionType,file);
+        boolean res = programService.addProgramVersion(name,protocol,date,devType,remark,versionType,fileName,file);
         if (res) {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
         } else {
@@ -91,9 +92,10 @@ public class ProgramVersionController extends BaseController {
                                            @RequestParam("devType") String devType,
                                            @RequestParam("remark") String remark,
                                            @RequestParam(value = "versionType",required = false) String versionType,
+                                           @RequestParam("filename") String fileName,
                                            @ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file) {
         String methodDescribe = getMethodDescribe("updateProgramVersion");
-        boolean res = programService.updateProgramVersion(id,name,protocol,date,devType,remark,versionType,file);
+        boolean res = programService.updateProgramVersion(id,name,protocol,date,devType,remark,versionType,fileName,file);
         if (res) {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
         } else {

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml

@@ -14,7 +14,8 @@
         A.`Update_Time` updateTime,
         A.`Remark` remark,
         A.`Version_Type` versionType,
-        A.`Version_Flag` versionFlag
+        A.`Version_Flag` versionFlag,
+        A.`File_Name` fileName
         FROM
         cld_version A,
         sys_dict_data B,

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ProgramVersionService.java

@@ -22,7 +22,7 @@ public interface ProgramVersionService {
      * 新增程序版本管理信息
      * @return
      */
-    boolean addProgramVersion(String name, String protocol, LocalDate date, String devType, String remark, String versionType, MultipartFile file);
+    boolean addProgramVersion(String name, String protocol, LocalDate date, String devType, String remark, String versionType,String fileName, MultipartFile file);
     /**
      * 版本文件是否存在
      * @return
@@ -32,7 +32,7 @@ public interface ProgramVersionService {
      * 修改程序版本管理信息
      * @return
      */
-    boolean updateProgramVersion(String id, String name, String protocol, LocalDate date, String devType, String remark, String versionType, MultipartFile file);
+    boolean updateProgramVersion(String id, String name, String protocol, LocalDate date, String devType, String remark, String versionType,String fileName, MultipartFile file);
     /**
      * 修改程序版本状态
      * @return

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java

@@ -66,7 +66,7 @@ public class ProgramVersionServiceImpl extends ServiceImpl<VersionMapper, Versio
     }
 
     @Override
-    public boolean addProgramVersion(String name, String protocol, LocalDate date, String devType, String remark, String versionType, MultipartFile file) {
+    public boolean addProgramVersion(String name, String protocol, LocalDate date, String devType, String remark, String versionType, String fileName,MultipartFile file) {
         check(null,name,false);
         Version version = new Version();
         version.setName(name);
@@ -90,7 +90,7 @@ public class ProgramVersionServiceImpl extends ServiceImpl<VersionMapper, Versio
             e.printStackTrace();
         }
         version.setFile(b);
-
+        version.setFileName(fileName);
         version.setVersionFlag(DataStateEnum.ENABLE.getCode());
         version.setState(DataStateEnum.ENABLE.getCode());
         version.setCreateBy(RequestUtil.getUserIndex());
@@ -108,7 +108,7 @@ public class ProgramVersionServiceImpl extends ServiceImpl<VersionMapper, Versio
     }
 
     @Override
-    public boolean updateProgramVersion(String id, String name, String protocol, LocalDate date, String devType, String remark, String versionType, MultipartFile file) {
+    public boolean updateProgramVersion(String id, String name, String protocol, LocalDate date, String devType, String remark, String versionType, String fileName,MultipartFile file) {
         check(id,name,true);
         Version version = new Version();
         version.setId(id);
@@ -129,9 +129,9 @@ public class ProgramVersionServiceImpl extends ServiceImpl<VersionMapper, Versio
             e.printStackTrace();
         }
         version.setFile(b);
+        version.setFileName(fileName);
         version.setUpdateBy(RequestUtil.getUserIndex());
         version.setUpdateTime(LocalDateTime.now());
-
         versionMapper.updateById(version);
         return true;
     }

pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DeviceAbnormalStatisticsJob.java

@@ -7,9 +7,8 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
-import java.text.SimpleDateFormat;
+import java.time.LocalDate;
-import java.util.Calendar;
+import java.time.format.DateTimeFormatter;
-
 @Slf4j
 @Component
 @AllArgsConstructor
@@ -19,12 +18,10 @@ public class DeviceAbnormalStatisticsJob {
     @XxlJob("deviceAbnormalStatisticsJob")
     public void deviceAbnormalStatisticsJob (){
        // System.out.println("朱鑫宇定时任务");
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        String time = LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        String format = formatter.format(Calendar.getInstance().getTime());
+        log.info("执行日期deviceAbnormalStatisticsJob===============>"+time);
-        System.out.println(format);
-        log.info("执行日期deviceAbnormalStatisticsJob===============>"+format);
         DeviceAbnormaStatisticsParam param =new DeviceAbnormaStatisticsParam();
-        param.setTime(formatter.format(Calendar.getInstance().getTime()));
+        param.setTime(time);
         deviceAbnormalFeignClient.dailyDeviceAbnormaStatistics(param);
     }
 }