Merge branch 'master' of http://116.63.33.55/git/industry-data-platform

# Conflicts:
#	industry-system/industry-da/src/main/resources/mapper/PageAnimationDao.xml

industry-admin/.env.production

@@ -2,5 +2,5 @@
 ENV = 'production'
 
 # base api
-#VUE_APP_BASE_API = 'http://localhost:8081'
-VUE_APP_BASE_API = 'http://10.220.0.124:8081'
+VUE_APP_BASE_API = 'http://localhost:8081'
+#VUE_APP_BASE_API = 'http://10.220.0.124:8081'

industry-system/cqcy-ei-influxdb/src/main/resources/influxdb-client.yml

@@ -4,7 +4,7 @@ spring:
     sub-type: 0
     # 项目启动时间
     start-time: 2023-12-01
-    url: http://192.168.1.168:8086
+    url: http://localhost:8086
     token: zAyO0a0gdTHH8j7lo520TQFsoNuFhMEPkDLiurCr__uTbKrAUPyx1O4hMdwWT5eed-dIiHbKOJHOd7E6JpqifA==
     org: jd
     bucket: test

industry-system/industry-da/src/main/java/com/example/opc_da/controller/DeviceDataItemController.java

@@ -1,11 +1,13 @@
 package com.example.opc_da.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.example.opc_common.entity.DeviceDataItem;
 import com.example.opc_common.enums.ModelEnum;
 import com.example.opc_common.enums.OperationEnum;
 import com.example.opc_common.enums.ResultEnum;
 import com.example.opc_common.enums.ServerEnum;
 import com.example.opc_common.util.Blank;
+import com.example.opc_common.util.DateUtil;
 import com.example.opc_common.util.Result;
 import com.example.opc_da.annotation.WebLog;
 import com.example.opc_da.service.DeviceDataItemService;
@@ -111,7 +113,15 @@ public class DeviceDataItemController {
      */
     @GetMapping(value = "/getAllDeviceDataItem")
     @WebLog(ServerEnum = ServerEnum.SERVER, ModelEnum = ModelEnum.DEVICEDATAITEM, OperationEnum = OperationEnum.SELECT)
-    public Result getAllDeviceDataItem(Date startTime) {
-        return deviceDataItemService.getAllDeviceDataItem(startTime);
+    public Result getAllDeviceDataItem(String startTime) {
+        Date startTimeDate = new Date();
+        if(StrUtil.isNotEmpty(startTime)){
+            try {
+                startTimeDate = DateUtil.strYmdhmsChangeDate(startTime);
+            }catch (Exception e){
+                log.warn(e.getMessage());
+            }
+        }
+        return deviceDataItemService.getAllDeviceDataItem(startTimeDate);
     }
 }

industry-system/industry-da/src/main/java/com/example/opc_da/controller/DeviceRunController.java

@@ -1,11 +1,13 @@
 package com.example.opc_da.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.example.opc_common.entity.DeviceRun;
 import com.example.opc_common.enums.ModelEnum;
 import com.example.opc_common.enums.OperationEnum;
 import com.example.opc_common.enums.ResultEnum;
 import com.example.opc_common.enums.ServerEnum;
 import com.example.opc_common.util.Blank;
+import com.example.opc_common.util.DateUtil;
 import com.example.opc_common.util.Result;
 import com.example.opc_da.annotation.WebLog;
 import com.example.opc_da.service.DeviceRunService;
@@ -100,8 +102,16 @@ public class DeviceRunController {
      */
     @RequestMapping(value = "/getDeviceRunDataById",method = RequestMethod.GET)
     @WebLog(ServerEnum = ServerEnum.CLIENT, ModelEnum = ModelEnum.DEVICERUN, OperationEnum = OperationEnum.SELECT)
-    public Result getDeviceRunDataById(@NotNull Integer id, Date startTime) {
-        return deviceRunService.getDeviceRunDataById(id,startTime);
+    public Result getDeviceRunDataById(@NotNull Integer id, String startTime) {
+        Date startTimeDate = new Date();
+        if(StrUtil.isNotEmpty(startTime)){
+            try {
+                startTimeDate = DateUtil.strYmdhmsChangeDate(startTime);
+            }catch (Exception e){
+                log.warn(e.getMessage());
+            }
+        }
+        return deviceRunService.getDeviceRunDataById(id, startTimeDate);
     }
 
     /**

industry-system/industry-da/src/main/java/com/example/opc_da/controller/MainRunController.java

@@ -1,11 +1,13 @@
 package com.example.opc_da.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.example.opc_common.entity.MainRun;
 import com.example.opc_common.enums.ModelEnum;
 import com.example.opc_common.enums.OperationEnum;
 import com.example.opc_common.enums.ResultEnum;
 import com.example.opc_common.enums.ServerEnum;
 import com.example.opc_common.util.Blank;
+import com.example.opc_common.util.DateUtil;
 import com.example.opc_common.util.Result;
 import com.example.opc_da.annotation.WebLog;
 import com.example.opc_da.service.MainRunService;
@@ -100,8 +102,16 @@ public class MainRunController {
      */
     @RequestMapping(value = "/getMainRunDataById", method = RequestMethod.GET)
     @WebLog(ServerEnum = ServerEnum.CLIENT, ModelEnum = ModelEnum.MAINRUN, OperationEnum = OperationEnum.SELECT)
-    public Result getMainRunDataById(@NotNull Integer id, Date startTime) {
-        return mainRunService.getMainRunDataById(id,startTime);
+    public Result getMainRunDataById(@NotNull Integer id, String startTime) {
+        Date startTimeDate = new Date();
+        if(StrUtil.isNotEmpty(startTime)){
+            try {
+                startTimeDate = DateUtil.strYmdhmsChangeDate(startTime);
+            }catch (Exception e){
+                log.warn(e.getMessage());
+            }
+        }
+        return mainRunService.getMainRunDataById(id, startTimeDate);
     }
 
     /**

industry-system/industry-da/src/main/java/com/example/opc_da/controller/PageAnimationController.java

@@ -7,6 +7,7 @@ import com.example.opc_common.enums.ModelEnum;
 import com.example.opc_common.enums.OperationEnum;
 import com.example.opc_common.enums.ResultEnum;
 import com.example.opc_common.enums.ServerEnum;
+import com.example.opc_common.util.DateUtil;
 import com.example.opc_common.util.Result;
 import com.example.opc_da.annotation.WebLog;
 import com.example.opc_da.service.PageAnimationService;
@@ -57,12 +58,20 @@ public class PageAnimationController {
     @GetMapping("getPageAnimationStatusByType")
 //    @PermissionControl
     @WebLog(ServerEnum = ServerEnum.SERVER, ModelEnum = ModelEnum.PAGEANIMATION, OperationEnum = OperationEnum.SELECT)
-    public Result getPageAnimationStatusByType(@RequestParam("type") String type,Date startTime) {
+    public Result getPageAnimationStatusByType(@RequestParam("type") String type,String startTime) {
         Boolean flag = ListUtil.toList(StrUtil.split("ztfj,ztfjqql,ztzcql,ztzcqlys,fjzxtzfj,fjzxtyfj,ydgdx_L,ydgdx_C,ydgdx_R", ",")).contains(type);
         if (!flag) {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS);
         }
-        return pageAnimationService.getPageAnimationStatusByType(type,startTime);
+        Date startTimeDate = new Date();
+        if(StrUtil.isNotEmpty(startTime)){
+            try {
+                startTimeDate = DateUtil.strYmdhmsChangeDate(startTime);
+            }catch (Exception e){
+                log.warn(e.getMessage());
+            }
+        }
+        return pageAnimationService.getPageAnimationStatusByType(type, startTimeDate);
     }
     /**
      * 查看
@@ -70,11 +79,19 @@ public class PageAnimationController {
     @GetMapping("getPageAnimationValueByType")
 //    @PermissionControl
     @WebLog(ServerEnum = ServerEnum.SERVER, ModelEnum = ModelEnum.PAGEANIMATION, OperationEnum = OperationEnum.SELECT)
-    public Result getPageAnimationValueByType(@RequestParam("type") String type, Date startTime) {
+    public Result getPageAnimationValueByType(@RequestParam("type") String type, String startTime) {
         Boolean flag = ListUtil.toList(StrUtil.split("ztfj,ztfjqql,ztzcql,ztzcqlys,fjzxtzfj,fjzxtyfj,ydgdx_L,ydgdx_C,ydgdx_R", ",")).contains(type);
         if (!flag) {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS);
         }
-        return pageAnimationService.getPageAnimationValueByType(type,startTime);
+        Date startTimeDate = new Date();
+        if(StrUtil.isNotEmpty(startTime)){
+            try {
+                startTimeDate = DateUtil.strYmdhmsChangeDate(startTime);
+            }catch (Exception e){
+                log.warn(e.getMessage());
+            }
+        }
+        return pageAnimationService.getPageAnimationValueByType(type,startTimeDate);
     }
 }

industry-system/industry-da/src/main/java/com/example/opc_da/task/AsyncTask.java

@@ -19,10 +19,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
+import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -60,6 +62,9 @@ public class AsyncTask {
     @Value("${autoReportTable.pageUrl}")
     private String autoReportTablePageUrl;
 
+    @Resource
+    private Environment environment;
+
     /**
      * 新增一组报警日志数据
      *
@@ -192,10 +197,12 @@ public class AsyncTask {
         autoReportTableExcelUrl = autoReportTableExcelUrl.replace("{{clientIP}}", printIp);
         log.info("runPrint.autoReportTableExcelUrl:" + autoReportTableExcelUrl);
         if (StrUtil.isEmpty(autoReportTablePageUrl)) {
-            autoReportTablePageUrl = "http://{{severIp}}:8081/reportSheet/report-history.html?id={{autoReportTableId}}&printType=task" +
-                    "&printConfig={{printConfig}}&serverUrl=http://{{severIp}}:8081&printUrl=http://{{clientIP}}:8084/api/printFile";
+            autoReportTablePageUrl = "http://{{severIp}}:{{severPort}}/reportSheet/report-history.html?id={{autoReportTableId}}&printType=task" +
+                    "&printConfig={{printConfig}}&serverUrl=http://{{severIp}}:{{severPort}}&printUrl=http://{{clientIP}}:8084/api/printFile";
         }
+        String severPort = environment.getProperty("local.server.port");
         autoReportTablePageUrl = autoReportTablePageUrl.replace("{{autoReportTableId}}", reportTableId)
+                .replace("{{severPort}}", severPort)
                 .replace("{{clientIP}}", printIp)
                 .replace("{{printConfig}}", printConfigStr);
         log.info("runPrint.autoReportTablePageUrl:" + autoReportTablePageUrl);

industry-system/industry-da/src/main/resources/application-prod.yml

@@ -25,7 +25,8 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://localhost:3306/in_data_db?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
     username: root
-    password: jd@2021
+    #password: jd@2021
+    password: Ei$2024
     hikari:
       # 设置是否自动提交事务，默认为true
       auto-commit: true
@@ -46,7 +47,8 @@ spring:
     database: 0
     host: 127.0.0.1
     port: 6379
-    password: jd123456
+    #password: jd123456
+    password: Ei$2024
     jedis:
       pool:
         max-active: 50

industry-system/industry-da/src/main/resources/application-test.yml

@@ -23,7 +23,7 @@ spring:
       max-request-size: 1500MB
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.1.253:3306/in_data_db?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+    url: jdbc:mysql://192.168.1.253:3306/in_data_db3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
     username: root
     #password: root
     password: jd@2021

industry-system/industry-da/src/main/resources/application.yml

@@ -19,8 +19,8 @@ mybatis:
 
 autoReportTable:
   excelUrl: "http://{{clientIP}}:8084/api/printReportTable"
-  pageUrl: "http://{{severIp}}:8081/reportSheet/report-history.html?id={{autoReportTableId}}&printType=task\
-  &printConfig={{printConfig}}&serverUrl=http://{{severIp}}:8081&printUrl=http://{{clientIP}}:8084/api/printFile"
+  pageUrl: "http://{{severIp}}:{{severIp}}/reportSheet/report-history.html?id={{autoReportTableId}}&printType=task\
+  &printConfig={{printConfig}}&serverUrl=http://{{severIp}}:{{severIp}}&printUrl=http://{{clientIP}}:8084/api/printFile"
 
 springboot:
   license:

industry-system/industry-da/src/main/resources/mapper/PageAnimationDao.xml

@@ -50,15 +50,6 @@
     <select id="getPageAnimationNameByDeviceLedgerId" resultType="map">
         select ti.itemReadName
         from (
-                 select DISTINCT tddi.item_id,IF(IFNULL(ti.modbus_config,'') = '', ti.item_read_name, ti.item_name) itemReadName
-                 from t_device_data_item tddi
-                          inner join t_item ti on ti.id = tddi.item_id
-                          inner join t_device_ledger_item tdli on tdli.device_ledger_id =#{id} and tdli.item_id = tddi.item_id
-             ) ti
-        -- ORDER BY ti.itemReadName
-        union
-        select ti.itemReadName
-        from (
             select DISTINCT tpa.item_id,IF(IFNULL(ti.modbus_config,'') = '', ti.item_read_name, ti.item_name) itemReadName
             from t_page_animation tpa
             inner join t_item ti on ti.id = tpa.item_id