Merge branch 'main' of http://222.71.165.188:3000/linkage/TTXH-MES into main

# Conflicts:
#	linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttpouringequip/service/impl/TtPouringEquipServiceImpl.java

.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/

.idea/.name

@@ -1 +0,0 @@
-linkage-boot-parent

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

ant-design-vue/.env.production

@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_BASE_URL=http://222.71.165.188:8091/linkage-boot
+VUE_APP_API_BASE_URL=http://192.168.20.233:8091/linkage-boot
-VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
+VUE_APP_CAS_BASE_URL=http://192.168.20.233:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

ant-design-vue/src/views/user/LoginAccount.vue

@@ -2,12 +2,12 @@
     <div>
       <a-form-model ref="form" :model="model" :rules="validatorRules">
         <a-form-model-item required prop="username">
-          <a-input v-model="model.username" size="large" placeholder="请输入帐户名 / admin">
+          <a-input v-model="model.username" size="large" placeholder="请输入帐户名">
             <a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
           </a-input>
         </a-form-model-item>
         <a-form-model-item required prop="password">
-          <a-input v-model="model.password" size="large" type="password" autocomplete="false" placeholder="请输入密码 / 123456">
+          <a-input v-model="model.password" size="large" type="password" autocomplete="false" placeholder="请输入密码">
             <a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }"/>
           </a-input>
         </a-form-model-item>
@@ -43,8 +43,8 @@
         currdatetime: '',
         loginType: 0,
         model:{
-          username: 'admin',
+          username: '',
-          password: '123456',
+          password: '',
           inputCode: ''
         },
         validatorRules:{

linkage-boot/linkage-module-system/linkage-system-start/src/main/java/org/jeecg/custom/task/TtDataCollectTask.java

@@ -87,6 +87,7 @@ public class TtDataCollectTask implements SchedulingConfigurer {
                     TtPouringEquip ttPouringEquip = new TtPouringEquip();
                     ttPouringEquip.setTemperature(new BigDecimal(temp));
                     ttPouringEquip.setCreateTime(new Date());
+                    ttPouringEquip.setCreateBy("system");
                     ttPouringEquip.setType(type);
                     ttPouringEquip.setEqtNo(Optional.ofNullable(eqtNoIpMap.get(eqtIp)).orElse("0"));
                     ttPouringEquip.setEqtIp(eqtIp);
@@ -119,6 +120,7 @@ public class TtDataCollectTask implements SchedulingConfigurer {
                     TtFeedingEquip ttFeedingEquip = new TtFeedingEquip();
                     ttFeedingEquip.setTemperature(new BigDecimal(temp));
                     ttFeedingEquip.setCreateTime(new Date());
+                    ttFeedingEquip.setCreateBy("system");
                     ttFeedingEquip.setEqtNo(Optional.ofNullable(eqtNoIpMap.get(eqtIp)).orElse("0"));
                     ttFeedingEquip.setEqtIp(eqtIp);
                     feedingEquipService.save(ttFeedingEquip);
@@ -128,8 +130,8 @@ public class TtDataCollectTask implements SchedulingConfigurer {
         }
 
 
-//        String cron2 = "0 0 8 * * ?";
+        String cron2 = "0 0 8 * * ?";
-        String cron2 = "0/5 * * * * ?";
+//        String cron2 = "0 0/5 * * * ?";
         // 创建数字电表定时任务
         for(Map.Entry<DEVICE_TYPE, RS485Handler> entry : meterHandlerMap.entrySet()) {
             RS485Handler handler = entry.getValue();
@@ -146,6 +148,7 @@ public class TtDataCollectTask implements SchedulingConfigurer {
                     TtElectricMeter ttElectricMeter = new TtElectricMeter();
                     ttElectricMeter.setTotalPower(totalPower);
                     ttElectricMeter.setCreateTime(new Date());
+                    ttElectricMeter.setCreateBy("system");
                     ttElectricMeter.setEqtNo(Optional.ofNullable(eqtNoIpMap.get(eqtIp)).orElse("0"));
                     ttElectricMeter.setEqtIp(eqtIp);
                     // 获取昨日用电量

linkage-boot/linkage-module-system/linkage-system-start/src/main/resources/application-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8091
   tomcat:
     max-swallow-size: -1
   error:
@@ -7,7 +7,7 @@ server:
     include-stacktrace: ALWAYS
     include-message: ALWAYS
   servlet:
-    context-path: /jeecg-boot
+    context-path: /linkage-boot
   compression:
     enabled: true
     min-response-size: 1024
@@ -130,9 +130,9 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://127.0.0.1:3306/ttxh?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          username: root
+          username: ttxh
-          password: root
+          password: ttxh2023&.M
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
@@ -196,7 +196,7 @@ jeecg:
   elasticsearch:
     cluster-name: jeecg-ES
     cluster-nodes: 127.0.0.1:9200
-    check-enabled: true
+    check-enabled: false
   # 在线预览文件服务器地址配置
   file-view-domain: http://fileview.jeecg.com
   # minio文件上传
@@ -245,7 +245,7 @@ knife4j:
   #开启生产环境屏蔽
   production: false
   basic:
-    enable: true
+    enable: false
     username: jeecg
     password: jeecg1314
 #第三方登录