diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VersionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VersionController.java new file mode 100644 index 0000000..4aa9a83 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VersionController.java @@ -0,0 +1,60 @@ +// +// Source code recreated from a .class file by IntelliJ IDEA +// (powered by FernFlower decompiler) +// + +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.util.DateUtil; +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.system.dto.VersionExtDTO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +@RestController +public class VersionController extends BaseController { + private static Logger logger = LoggerFactory.getLogger(VersionController.class); + @Value("${casic.file.uploadPath:D://tmp//}") + private String appPath; + private static String APP_DOWNLOAD = "app/"; + + public VersionController() { + } + + @PostMapping({"/app/checkVersionList"}) + public ResponseData checkVersion(String nowVersion) { + List versionExtDTOList = new ArrayList<>(); + File file = new File(this.appPath.concat(APP_DOWNLOAD)); + if (file.isDirectory()) { + String[] filelist = file.list(); + if (ToolUtil.isNotEmpty(filelist)) { + Arrays.sort(filelist); + for (String s : filelist) { + String apkName = s; + String version = apkName.replaceAll(".apk", ""); + VersionExtDTO versionDto = new VersionExtDTO(); + versionDto.setVersion(version); + versionDto.setDownloadUrl(APP_DOWNLOAD.concat(apkName)); + File fileApk = new File(this.appPath.concat(APP_DOWNLOAD).concat(s)); + long lastModified = fileApk.lastModified(); + versionDto.setUpdateTime(DateUtil.formatDate(new Date(lastModified), "yyyy-MM-dd")); + versionExtDTOList.add(versionDto); + } + } + return ResponseData.success(versionExtDTOList); + } + + return ResponseData.error("暂无APK版本"); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VersionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VersionController.java new file mode 100644 index 0000000..4aa9a83 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VersionController.java @@ -0,0 +1,60 @@ +// +// Source code recreated from a .class file by IntelliJ IDEA +// (powered by FernFlower decompiler) +// + +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.util.DateUtil; +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.system.dto.VersionExtDTO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +@RestController +public class VersionController extends BaseController { + private static Logger logger = LoggerFactory.getLogger(VersionController.class); + @Value("${casic.file.uploadPath:D://tmp//}") + private String appPath; + private static String APP_DOWNLOAD = "app/"; + + public VersionController() { + } + + @PostMapping({"/app/checkVersionList"}) + public ResponseData checkVersion(String nowVersion) { + List versionExtDTOList = new ArrayList<>(); + File file = new File(this.appPath.concat(APP_DOWNLOAD)); + if (file.isDirectory()) { + String[] filelist = file.list(); + if (ToolUtil.isNotEmpty(filelist)) { + Arrays.sort(filelist); + for (String s : filelist) { + String apkName = s; + String version = apkName.replaceAll(".apk", ""); + VersionExtDTO versionDto = new VersionExtDTO(); + versionDto.setVersion(version); + versionDto.setDownloadUrl(APP_DOWNLOAD.concat(apkName)); + File fileApk = new File(this.appPath.concat(APP_DOWNLOAD).concat(s)); + long lastModified = fileApk.lastModified(); + versionDto.setUpdateTime(DateUtil.formatDate(new Date(lastModified), "yyyy-MM-dd")); + versionExtDTOList.add(versionDto); + } + } + return ResponseData.success(versionExtDTOList); + } + + return ResponseData.error("暂无APK版本"); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VersionExtDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VersionExtDTO.java new file mode 100644 index 0000000..c7d1285 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VersionExtDTO.java @@ -0,0 +1,10 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class VersionExtDTO { + private String version; + private String downloadUrl; + private String updateTime; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VersionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VersionController.java new file mode 100644 index 0000000..4aa9a83 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VersionController.java @@ -0,0 +1,60 @@ +// +// Source code recreated from a .class file by IntelliJ IDEA +// (powered by FernFlower decompiler) +// + +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.util.DateUtil; +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.system.dto.VersionExtDTO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +@RestController +public class VersionController extends BaseController { + private static Logger logger = LoggerFactory.getLogger(VersionController.class); + @Value("${casic.file.uploadPath:D://tmp//}") + private String appPath; + private static String APP_DOWNLOAD = "app/"; + + public VersionController() { + } + + @PostMapping({"/app/checkVersionList"}) + public ResponseData checkVersion(String nowVersion) { + List versionExtDTOList = new ArrayList<>(); + File file = new File(this.appPath.concat(APP_DOWNLOAD)); + if (file.isDirectory()) { + String[] filelist = file.list(); + if (ToolUtil.isNotEmpty(filelist)) { + Arrays.sort(filelist); + for (String s : filelist) { + String apkName = s; + String version = apkName.replaceAll(".apk", ""); + VersionExtDTO versionDto = new VersionExtDTO(); + versionDto.setVersion(version); + versionDto.setDownloadUrl(APP_DOWNLOAD.concat(apkName)); + File fileApk = new File(this.appPath.concat(APP_DOWNLOAD).concat(s)); + long lastModified = fileApk.lastModified(); + versionDto.setUpdateTime(DateUtil.formatDate(new Date(lastModified), "yyyy-MM-dd")); + versionExtDTOList.add(versionDto); + } + } + return ResponseData.success(versionExtDTOList); + } + + return ResponseData.error("暂无APK版本"); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VersionExtDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VersionExtDTO.java new file mode 100644 index 0000000..c7d1285 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VersionExtDTO.java @@ -0,0 +1,10 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class VersionExtDTO { + private String version; + private String downloadUrl; + private String updateTime; +} diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java index dc70fb3..463ff7d 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java @@ -469,7 +469,7 @@ return results; } - + @Transactional @Override public List> workList(Page page, String groupId, String onedeptid, String actUserId, QueryCondition queryCondition) { List> results = this.baseMapper.workList(page, groupId, onedeptid, actUserId, queryCondition); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VersionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VersionController.java new file mode 100644 index 0000000..4aa9a83 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VersionController.java @@ -0,0 +1,60 @@ +// +// Source code recreated from a .class file by IntelliJ IDEA +// (powered by FernFlower decompiler) +// + +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.util.DateUtil; +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.system.dto.VersionExtDTO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +@RestController +public class VersionController extends BaseController { + private static Logger logger = LoggerFactory.getLogger(VersionController.class); + @Value("${casic.file.uploadPath:D://tmp//}") + private String appPath; + private static String APP_DOWNLOAD = "app/"; + + public VersionController() { + } + + @PostMapping({"/app/checkVersionList"}) + public ResponseData checkVersion(String nowVersion) { + List versionExtDTOList = new ArrayList<>(); + File file = new File(this.appPath.concat(APP_DOWNLOAD)); + if (file.isDirectory()) { + String[] filelist = file.list(); + if (ToolUtil.isNotEmpty(filelist)) { + Arrays.sort(filelist); + for (String s : filelist) { + String apkName = s; + String version = apkName.replaceAll(".apk", ""); + VersionExtDTO versionDto = new VersionExtDTO(); + versionDto.setVersion(version); + versionDto.setDownloadUrl(APP_DOWNLOAD.concat(apkName)); + File fileApk = new File(this.appPath.concat(APP_DOWNLOAD).concat(s)); + long lastModified = fileApk.lastModified(); + versionDto.setUpdateTime(DateUtil.formatDate(new Date(lastModified), "yyyy-MM-dd")); + versionExtDTOList.add(versionDto); + } + } + return ResponseData.success(versionExtDTOList); + } + + return ResponseData.error("暂无APK版本"); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VersionExtDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VersionExtDTO.java new file mode 100644 index 0000000..c7d1285 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VersionExtDTO.java @@ -0,0 +1,10 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class VersionExtDTO { + private String version; + private String downloadUrl; + private String updateTime; +} diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java index dc70fb3..463ff7d 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java @@ -469,7 +469,7 @@ return results; } - + @Transactional @Override public List> workList(Page page, String groupId, String onedeptid, String actUserId, QueryCondition queryCondition) { List> results = this.baseMapper.workList(page, groupId, onedeptid, actUserId, queryCondition); diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 28020f8..66ae103 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -3,9 +3,9 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://localhost:3316/casic_smartcity_dcms_cr?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic_smartcity_dcms_cr?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: root + password: Casic203! initial-size: 2 min-idle: 1 jms: @@ -26,9 +26,9 @@ nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram,/departmentAssess/sourceList,/departmentAssess/highEventList,/case/addWeChat,/case/historyByPhoneListPage,/dict/code/caseSource,/fileUpload flowable: datasource: - url: jdbc:mysql://localhost:3316/dcms_flowable_cr?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/dcms_flowable_cr?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: root + password: Casic203! case: cancelNodes: 30303,30302,30304 #允许撤销的节点key logging: