提交

amos-boot-module/amos-boot-module-biz/amos-boot-module-avic-biz/src/main/java/com/yeejoin/amos/avic/config/AmosAuth.java

@@ -38,7 +38,7 @@ public class AmosAuth {
 
 	HashMap<String, Object> model = null;
 
-	@PostConstruct
+	//@PostConstruct
 	public void login() {
 		new Thread(new Runnable() {
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java

@@ -580,7 +580,9 @@ public class FireFightingSystemController extends AbstractBaseController {
         log.info("orgCode当前值为：：" + equipTypeAmountPage.getBizOrgCode());
         if (StringUtil.isNotEmpty(equipTypeAmountPage.getEquipmentClassificationCode())) {
             QueryWrapper<EquipmentCategory> equipmentCategoryQueryWrapper = new QueryWrapper<>();
+            log.info("code当前值为：：" + equipTypeAmountPage.getEquipmentClassificationCode());
             equipmentCategoryQueryWrapper.eq("code", equipTypeAmountPage.getEquipmentClassificationCode());
+            log.info("industry_code当前值为：：" + equipTypeAmountPage.getIndustryCode());
             equipmentCategoryQueryWrapper.eq("industry_code", equipTypeAmountPage.getIndustryCode());
             EquipmentCategory equipmentCategory = equipmentCategoryService.getOne(equipmentCategoryQueryWrapper);
             if (equipmentCategory == null) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/CarServiceImpl.java

@@ -1479,7 +1479,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
 	public Map<String, Integer> getCountOfCarBelongCompany(String orgCode) {
 		Map<String, Integer> map = new HashMap<>();
 		map.put("countofCompany", this
-				.list(new LambdaQueryWrapper<Car>().likeRight(Car::getBizOrgCode, orgCode).groupBy(Car::getBizOrgCode))
+				.list(new LambdaQueryWrapper<Car>().select(Car::getBizOrgCode).likeRight(Car::getBizOrgCode, orgCode).groupBy(Car::getBizOrgCode))
 				.size());
 		return map;
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/WlCarMileageServiceImpl.java

@@ -24,6 +24,7 @@ import com.yeejoin.equipmanage.mapper.WlCarSpeedWaringRecordMapper;
 import com.yeejoin.equipmanage.service.ICarService;
 import com.yeejoin.equipmanage.service.IWlCarMileageService;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.logging.log4j.LogManager;
 import org.checkerframework.checker.units.qual.Speed;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -89,6 +90,7 @@ public class WlCarMileageServiceImpl extends ServiceImpl<WlCarMileageMapper, WlC
     private EmqKeeper emqKeeper;
     @Autowired
     private RedisTemplate redisTemplate;
+    private final org.apache.logging.log4j.Logger logger = LogManager.getLogger(WlCarMileageServiceImpl.class);
 
     public static List<String> getDayByMonth(Date date) {
         List<String> data = new ArrayList<>();
@@ -141,7 +143,8 @@ public class WlCarMileageServiceImpl extends ServiceImpl<WlCarMileageMapper, WlC
         String deviceName = iotCode.replace(measurement, "");
         // 由于iot存在毫秒故结束时间要+1秒 iot+1秒有bug还是查不到 +2秒
         ResponseModel<List<Object>> result = iotFeign.getLiveData(measurement, deviceName, wlCarMileage.getStartTime(),
-                new Date(wlCarMileage.getEndTime().getTime()));
+                wlCarMileage.getEndTime());
+        logger.info("influxdb结果: "+JSONObject.toJSONString(result));
         List<Object> list = result.getResult();
         List<Coordinate> coordinateList = new ArrayList<Coordinate>();
         if (list != null) {

amos-boot-system-equip/src/main/resources/application-kingbase.properties

 spring.datasource.driver-class-name=com.kingbase8.Driver
-spring.datasource.url = jdbc:kingbase8://172.16.10.248:54321/equipment_cl?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&binaryTransferDisable=TINYINT
+spring.datasource.url = jdbc:kingbase8://192.168.0.71:54321/cl_equipment?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&binaryTransferDisable=TINYINT
 spring.datasource.username=root
 spring.datasource.password=Yeejoin@2020
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
@@ -17,7 +17,7 @@ eureka.instance.prefer-ip-address = true
 #服务实例ip地址，若eureka.instance.prefer-ip-address=false,ip-address设置失效，一般情况不用设置。
 #eureka.instance.ip-address= 172.16.3.135
 #eureka服务ip配置，可填写固定ip地址
-eureka.instance.hostname=172.16.10.234
+eureka.instance.hostname=192.168.0.54
 #eureka服务配置的校验账号及密码,配置需和eureka服务后台配置文件中一致
 spring.security.user.name=admin
 spring.security.user.password=a1234560
@@ -27,7 +27,7 @@ eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${sprin
 
 #redis
 spring.redis.database=1
-spring.redis.host=172.16.10.234
+spring.redis.host=192.168.0.54
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
@@ -39,15 +39,15 @@ spring.redis.expire.time=30000
 ## emqx
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://172.16.10.234:1883
+emqx.broker=tcp://192.168.0.54:1883
 emqx.user-name=super
 emqx.password=123456
-mqtt.scene.host=mqtt://172.16.10.234:8083/mqtt
+mqtt.scene.host=mqtt://192.168.0.54:8083/mqtt
 mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000
 # influxDB
-spring.influx.url=http://172.16.10.234:8086
+spring.influx.url=http://192.168.0.54:8086
 spring.influx.password=Yeejoin@2020
 spring.influx.user=root
 spring.influx.database=iot_platform

amos-boot-system-equip/src/main/resources/application.properties

-spring.application.name=AMOS-EQUIPMANAGE
+spring.application.name=AMOS-EQUIPMANAGE-WJ
 server.servlet.context-path=/equip
 server.port=8100