fuyuchuan 2 месяцев назад
Родитель
Сommit
47cbd9f69b

+ 3 - 2
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseCompanyServiceImpl.java

@@ -91,8 +91,7 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
                 .in(BaseCompany::getCompanyId, companyIdList)
                 .eq(BaseCompany::getEnable, 0)
                 .orderByDesc(BaseCompany::getId);
-        List<BaseCompany> list = this.list(queryWrapper);
-        return list;
+        return this.list(queryWrapper);
     }
 
     @Override
@@ -1129,12 +1128,14 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
         if (CollectionUtils.isEmpty(list)) {
             return;
         }
+        LocalDateTime now = LocalDateTime.now();
         List<BaseCompanyAttach1> batch = list.stream()
                 .map(vo -> {
                     BaseCompanyAttach1 attach1 = new BaseCompanyAttach1();
                     attach1.setId(vo.getId());
                     attach1.setLongitude(vo.getLongitude());
                     attach1.setLatitude(vo.getLatitude());
+                    attach1.setUpdateTime(now);
                     return attach1;
                 })
                 .collect(Collectors.toList());

+ 3 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseGgpFacilityServiceImpl.java

@@ -15,6 +15,7 @@ import com.usky.fire.service.vo.*;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -129,12 +130,14 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
         if (CollectionUtils.isEmpty(list)) {
             return;
         }
+        LocalDateTime now = LocalDateTime.now();
         List<BaseGgpFacility> batch = list.stream()
                 .map(vo -> {
                     BaseGgpFacility attach1 = new BaseGgpFacility();
                     attach1.setId(vo.getId());
                     attach1.setLongitude(vo.getLongitude());
                     attach1.setLatitude(vo.getLatitude());
+                    attach1.setUpdateTime(now);
                     return attach1;
                 })
                 .collect(Collectors.toList());

+ 6 - 6
service-fire/service-fire-biz/src/main/resources/application.yml

@@ -43,12 +43,12 @@ spring:
     dynamic:
       datasource:
         master:
-          url: jdbc:mysql://192.168.10.165:3306/usky-fire?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&queryTimeout=2400
-          username: root
-          password: yt123456
-#          driver-class-name: dm.jdbc.driver.DmDriver
-#          password: Yt#75Usky
-#          url: jdbc:dm://localhost:5237/SYSDBA?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
+#          url: jdbc:mysql://192.168.10.165:3306/usky-fire?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&queryTimeout=2400
+#          username: root
+#          password: yt123456
+          driver-class-name: dm.jdbc.driver.DmDriver
+          password: Yt#75Usky
+          url: jdbc:dm://localhost:5237/SYSDBA?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
       #          username: SYSDBA
       #        mhsystem:
       #          password: mysql570