投资计划

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java

@@ -85,7 +85,7 @@ public class SystemUserAuthController {
 		SystemUserAuthDto userInfo = new SystemUserAuthDto();
 		checkLogin(user, userInfo, result);
 		if (result.getCode() != CommonConstant.SC_INTERNAL_SERVER_ERROR_500) {
-			String token = jwtTokenProvider.createToken(userInfo.getAccount(), 3600 * 24);
+			String token = jwtTokenProvider.createToken(userInfo.getAccount(), 3600 * 24 * 1000L);
 			userInfo.setToken(token);
 			userInfo.setIsEngineering(systemUserDataScopeService.count(Wrappers.<SystemUserDataScope>lambdaQuery()
 					.eq(SystemUserDataScope::getUserId, userInfo.getUserId())) > 0);
@@ -240,7 +240,8 @@ public class SystemUserAuthController {
 			SystemUserAuthDto userInfo = new SystemUserAuthDto();
 			checkLogin(user, userInfo, result);
 			if (result.getCode() != CommonConstant.SC_INTERNAL_SERVER_ERROR_500) {
-				String token = jwtTokenProvider.createToken(userInfo.getAccount(), 3600 * 24);
+				Long time = decrypt.getLong("exp") - System.currentTimeMillis();
+				String token = jwtTokenProvider.createToken(userInfo.getAccount(), time/1000);
 				userInfo.setToken(token);
 				userInfo.setIsEngineering(systemUserDataScopeService.count(Wrappers.<SystemUserDataScope>lambdaQuery()
 						.eq(SystemUserDataScope::getUserId, userInfo.getUserId())) > 0);

src/main/java/com/zhgd/xmgl/modules/safety/entity/InvestmentPaymentDetail.java

@@ -106,4 +106,10 @@ public class InvestmentPaymentDetail implements Serializable {
     @Excel(name = "截止本期末累计完成金额", width = 15)
     @ApiModelProperty(value = "截止本期末累计完成金额")
     private String endAmount;
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remark;
 }

src/main/java/com/zhgd/xmgl/security/JwtTokenProvider.java

@@ -46,10 +46,10 @@ public class JwtTokenProvider {
      * @param validityInMilliseconds 单位是秒
      * @return
      */
-    public String createToken(String username, Integer validityInMilliseconds) {
+    public String createToken(String username, Long validityInMilliseconds) {
         Claims claims = Jwts.claims().setSubject(username);
         Date now = new Date();
-        Date validity = new Date(now.getTime() + validityInMilliseconds * 1000);
+        Date validity = new Date(now.getTime() + validityInMilliseconds);
         String token = Jwts.builder()//
                 .setClaims(claims)//
                 .setIssuedAt(now)//

src/main/resources/magic/api/惠州项目管理政务版/在建项目指标.ms

@@ -5,7 +5,7 @@
   "groupId" : "1f3d3e5b9fe340bab84de67b0de08f44",
   "name" : "在建项目指标",
   "createTime" : null,
-  "updateTime" : 1688264176650,
+  "updateTime" : 1688352901714,
   "lock" : null,
   "createBy" : null,
   "updateBy" : "admin",
@@ -34,4 +34,4 @@
   "responseBodyDefinition" : null
 }
 ================================
-return db.selectOne("SELECT IFNULL(SUM(IF(major_project_type = 1, 1, 0)), 0) importance, IFNULL(SUM(IF(project_type = 1 AND state = 1, 1, 0)), 0) bridge, IFNULL(SUM(IF(project_type = 2 AND state = 1, 1, 0)), 0) tunnel, IFNULL(SUM(IF(project_type = 3 AND state = 1, 1, 0)), 0) station, IFNULL(SUM(IF(build_status = 1, 1, 0)), 0) newBuild, IFNULL(SUM(IF(build_status = 5, 1, 0)), 0) reBuild, IFNULL(SUM(IF(build_status = 6, 1, 0)), 0) extension, IFNULL(SUM(IF(build_status in (1, 5, 6), 1, 0)), 0) total, IFNULL(SUM(IF(build_status = 4, 1, 0)), 0) finished, IFNULL(SUM(IF(build_status = 2, 1, 0)), 0) shutdown, IFNULL(SUM(IF(build_status in (1, 2, 4), 1, 0)), 0) total1 FROM project WHERE #project ")
+return db.selectOne("SELECT IFNULL(SUM(IF(major_project_type = 1, 1, 0)), 0) importance, IFNULL(SUM(IF(project_type = 1 AND state = 1, 1, 0)), 0) bridge, IFNULL(SUM(IF(project_type = 2 AND state = 1, 1, 0)), 0) tunnel, IFNULL(SUM(IF(project_type = 3 AND state = 1, 1, 0)), 0) station, IFNULL(SUM(IF(build_status in (0,1), 1, 0)), 0) newBuild, IFNULL(SUM(IF(build_status = 5, 1, 0)), 0) reBuild, IFNULL(SUM(IF(build_status = 6, 1, 0)), 0) extension, IFNULL(SUM(IF(build_status in (1, 5, 6), 1, 0)), 0) total, IFNULL(SUM(IF(build_status = 4, 1, 0)), 0) finished, IFNULL(SUM(IF(build_status = 2, 1, 0)), 0) shutdown, IFNULL(SUM(IF(build_status in (1, 2, 4), 1, 0)), 0) total1 FROM project WHERE #project ")

src/main/resources/magic/api/惠州项目管理政务版/扬尘报警趋势(近30天).ms

@@ -5,7 +5,7 @@
   "groupId" : "1f3d3e5b9fe340bab84de67b0de08f44",
   "name" : "扬尘报警趋势(近30天)",
   "createTime" : null,
-  "updateTime" : 1688264934773,
+  "updateTime" : 1688352724279,
   "lock" : null,
   "createBy" : null,
   "updateBy" : "admin",
@@ -27,9 +27,10 @@ import java.text.SimpleDateFormat;
 List list = db.select("SELECT create_time FROM environment_alarm where DATE_SUB(CURDATE(), INTERVAL 15 DAY) <= date(create_time)")
 List result = new ArrayList()
 for (value in range(0,15)) {
+    var offday = value - 15
     Map map = new HashMap()
     Calendar c = Calendar.getInstance();
-    c.add(Calendar.DATE, -value);
+    c.add(Calendar.DATE, offday);
     Date startDate = c.getTime();
     SimpleDateFormat sdf  = new SimpleDateFormat("yyyy-MM-dd");
     String time = sdf.format(startDate);