修改bug

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkCollectServiceImpl.java

@@ -177,6 +177,7 @@ public class WorkCollectServiceImpl implements WorkCollectService {
      * @return 当日填报情况
      */
     @Override
+    @Transactional
     public WorkCollect getByUserIdAndWorkDay(Integer userId, Date workDay) {
         log.info("WorkCollectServiceImpl[]getByUserIdAndWorkDay[]input.param.userId：{}, workDay:{}" + userId, workDay);
         if (null == userId || null == workDay) {
@@ -216,6 +217,7 @@ public class WorkCollectServiceImpl implements WorkCollectService {
      * @return 是否成功
      */
     @Override
+    @Transactional
     public Boolean update(WorkCollect workCollect) {
         log.info("WorkCollectServiceImpl[]getByUserIdAndWorkDay[]input.param.workCollect：{}, " + workCollect);
         if (null == workCollect) {

wisenergy-shiro/src/main/java/cn/wisenergy/shiro/config/ShiroConfig.java

@@ -118,6 +118,7 @@ public class ShiroConfig {
         ShiroSessionManager sessionManager = new ShiroSessionManager();
         sessionManager.setSessionIdCookie(simpleCookie());
         sessionManager.setSessionDAO(sessionDAO());
+        sessionManager.setGlobalSessionTimeout(-1);
         return sessionManager;
     }
 

wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/auto/Trigger.java

@@ -50,7 +50,7 @@ public class Trigger implements SchedulingConfigurer {
                         throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
                     }
                     //  更新work_time_order表
-                    List<WorkTimeOrder> workTimeOrders = workTimeOrderMapper.getAutoOrder(autoExamine*24);
+                    List<WorkTimeOrder> workTimeOrders = workTimeOrderMapper.getAutoOrder(autoExamine * 24);
                     if (!CollectionUtils.isEmpty(workTimeOrders)) {
                         List<Integer> projectIds = new ArrayList<>();
                         workTimeOrders.forEach(wto -> projectIds.add(wto.getWorkId()));

wisenergy-web-admin/src/main/resources/application-dev.yml

@@ -27,7 +27,8 @@ spring:
       two:
         ## 数据源two配置
         name: DBconfig2
-        url: jdbc:mysql://192.168.110.84:3306/work_test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://192.168.110.84:3306/work_order?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+#        url: jdbc:mysql://192.168.110.84:3306/work_test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
         username: root
         password: admin!@#123
         driver-class-name: com.mysql.cj.jdbc.Driver
@@ -45,7 +46,8 @@ spring:
 
 
   redis:
-    database: 1
+    database: 0
+#    database: 1
     host: 192.168.110.84
     port: 6379
     password:    # 密码（默认为空）

wisenergy-web-admin/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
     uri-encoding: UTF-8
     max-threads: 1000
     min-spare-threads: 30
-  port: 8086
+  port: 8081
   connection-timeout: 5000ms