diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Version.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Version.java index 4d89d879a..401df5cbc 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Version.java +++ b/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-启用) */ diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/VersionVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/VersionVO.java index 8b53b1140..b1a5db9ce 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/VersionVO.java +++ b/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; } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java index ff8373ce2..d36ffee6b 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java +++ b/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 { diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml index 7594671d5..c1297d66c 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml +++ b/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, diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ProgramVersionService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ProgramVersionService.java index e2ae45d88..4b151bad2 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ProgramVersionService.java +++ 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 diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java index fee8cd1f9..f52bf4fd5 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java +++ b/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"+format); + String time = LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); + log.info("执行日期deviceAbnormalStatisticsJob===============>"+time); DeviceAbnormaStatisticsParam param =new DeviceAbnormaStatisticsParam(); - param.setTime(formatter.format(Calendar.getInstance().getTime())); + param.setTime(time); deviceAbnormalFeignClient.dailyDeviceAbnormaStatistics(param); } }