Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/DemoController.java

@@ -217,21 +217,29 @@ public class DemoController extends BaseController {
     @ApiOperation(value = "从Mysql同步数据到ES")
     @GetMapping("doc/getDatafromMySqlToES")
     public void getDatafromMySqlToES() {
-        List<EquipmentsJxiopDocMysql> equipmentsJxiopDocMysqlList = equipmentsJxiopDocMysqlMapper.selectList(new QueryWrapper<EquipmentsJxiopDocMysql>().like("front_module", "泰和功率预测"));
+//        List<EquipmentsJxiopDocMysql> equipmentsJxiopDocMysqlList = equipmentsJxiopDocMysqlMapper.selectList(new QueryWrapper<EquipmentsJxiopDocMysql>().eq("id","24_1669525017559306241"));
+        List<EquipmentsJxiopDocMysql> equipmentsJxiopDocMysqlList = equipmentsJxiopDocMysqlMapper.selectList(new QueryWrapper<EquipmentsJxiopDocMysql>().isNotNull("id"));
         equipmentsJxiopDocMysqlList.forEach(equipmentsJxiopDocMysql -> {
             ESEquipments esEquipments = equipmentsRepository.findById(equipmentsJxiopDocMysql.getId()).get();
+            esEquipments.setEquipmentIndexName(equipmentsJxiopDocMysql.getEquipmentIndexName());
+            esEquipments.setEquipmentNumber(ObjectUtils.isEmpty(equipmentsJxiopDocMysql.getEquipmentNumber())?"":equipmentsJxiopDocMysql.getEquipmentNumber());
+            esEquipments.setIsAlarm(equipmentsJxiopDocMysql.getIsAlarm());
+            esEquipments.setDataType(equipmentsJxiopDocMysql.getDataType());
+            esEquipments.setGatewayId(equipmentsJxiopDocMysql.getGatewayId());
+            esEquipments.setAddress(equipmentsJxiopDocMysql.getAddress());
+            esEquipments.setEquipmentSpecificName(equipmentsJxiopDocMysql.getEquipmentSpecificName());
             //更新显示名称
-            esEquipments.setDisplayName(equipmentsJxiopDocMysql.getDisplayName());
+            esEquipments.setDisplayName(ObjectUtils.isEmpty(equipmentsJxiopDocMysql.getDisplayName())?"":equipmentsJxiopDocMysql.getDisplayName());
             //更新排序号
-            esEquipments.setTraceId(equipmentsJxiopDocMysql.getTraceId());
+            esEquipments.setTraceId(ObjectUtils.isEmpty(equipmentsJxiopDocMysql.getTraceId())?"":equipmentsJxiopDocMysql.getTraceId());
             //更新单位
-            esEquipments.setUnit(equipmentsJxiopDocMysql.getUnit());
+            esEquipments.setUnit(ObjectUtils.isEmpty(equipmentsJxiopDocMysql.getUnit())?"":equipmentsJxiopDocMysql.getUnit());
             //更新frontModule
-            esEquipments.setFrontModule(equipmentsJxiopDocMysql.getFrontModule());
+            esEquipments.setFrontModule(ObjectUtils.isEmpty(equipmentsJxiopDocMysql.getFrontModule())?"":equipmentsJxiopDocMysql.getFrontModule());
             //更新systemType
-            esEquipments.setSystemType(equipmentsJxiopDocMysql.getSystemType());
+            esEquipments.setSystemType(ObjectUtils.isEmpty(equipmentsJxiopDocMysql.getSystemType())?"":equipmentsJxiopDocMysql.getSystemType());
             //更新图片名称
-//            esEquipments.setPictureName(equipmentsJxiopDocMysql.getPictureName());
+            esEquipments.setPictureName(ObjectUtils.isEmpty(equipmentsJxiopDocMysql.getPictureName())?"":equipmentsJxiopDocMysql.getPictureName());
             equipmentsRepository.save(esEquipments);
         });