解决冲突

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ESEquipmentCategoryDto.java

 package com.yeejoin.amos.boot.module.tzs.api.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.springframework.data.annotation.Id;
@@ -24,56 +23,54 @@ public class ESEquipmentCategoryDto {
     @Id
     private String SEQUENCE_NBR;
 
-    @Field(type = FieldType.Text,searchAnalyzer = "ik_max_word", analyzer = "ik_max_word")
+    @Field(type = FieldType.Text)
     private String ORG_BRANCH_NAME;
 
-    @Field(type = FieldType.Text,searchAnalyzer = "ik_max_word", analyzer = "ik_max_word")
+    @Field(type = FieldType.Text)
     private String ORG_BRANCH_CODE;
 
 
-
-    @Field(type = FieldType.Text,searchAnalyzer = "ik_max_word", analyzer = "ik_max_word")
+    @Field(type = FieldType.Text)
     private String USE_UNIT_NAME;
 
-    @Field(type = FieldType.Text,searchAnalyzer = "ik_max_word", analyzer = "ik_max_word")
-    private String   USE_UNIT_CREDIT_CODE;
+    @Field(type = FieldType.Text)
+    private String USE_UNIT_CREDIT_CODE;
 
-    @Field(type = FieldType.Text,searchAnalyzer = "ik_max_word", analyzer = "ik_max_word")
-    private String  EQU_LIST_CODE;
+    @Field(type = FieldType.Text)
+    private String EQU_LIST_CODE;
 
-    @Field(type = FieldType.Text,searchAnalyzer = "ik_max_word", analyzer = "ik_max_word")
-    private String  EQU_LIST;
+    @Field(type = FieldType.Text)
+    private String EQU_LIST;
 
-    @Field(type = FieldType.Text,searchAnalyzer = "ik_max_word", analyzer = "ik_max_word")
+    @Field(type = FieldType.Text)
     private String EQU_CATEGORY;
 
-    @Field(type = FieldType.Text,searchAnalyzer = "ik_max_word", analyzer = "ik_max_word")
-    private String   USE_ORG_CODE;
+    @Field(type = FieldType.Text)
+    private String USE_ORG_CODE;
 
-    @Field(type = FieldType.Text,searchAnalyzer = "ik_max_word", analyzer = "ik_max_word")
+    @Field(type = FieldType.Text)
     private String CODE96333;
 
-    @Field(type = FieldType.Text,searchAnalyzer = "ik_max_word", analyzer = "ik_max_word")
-    private String    EQU_CODE;
+    @Field(type = FieldType.Text)
+    private String EQU_CODE;
 
-    @Field(type = FieldType.Text,searchAnalyzer = "ik_max_word", analyzer = "ik_max_word")
+    @Field(type = FieldType.Text)
     private String SUPERVISORY_CODE;
 
-    @Field(type = FieldType.Text,searchAnalyzer = "ik_max_word", analyzer = "ik_max_word")
-    private String  USE_PLACE;
+    @Field(type = FieldType.Text)
+    private String USE_PLACE;
 
-    @Field(type = FieldType.Text,searchAnalyzer = "ik_max_word", analyzer = "ik_max_word")
+    @Field(type = FieldType.Text)
     private String ADDRESS;
 
     @Field(type = FieldType.Integer)
-    private Integer   EQU_STATE;
+    private Integer EQU_STATE;
 
-    @Field(type = FieldType.Text,searchAnalyzer = "ik_max_word", analyzer = "ik_max_word")
+    @Field(type = FieldType.Text)
     private String STATUS;
 
     @Field(type = FieldType.Date, format = DateFormat.basic_date_time, index = false)
     private Date REC_DATE;
 
 
-
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/EquipmentCategoryDataDto.java

@@ -18,8 +18,8 @@ public class EquipmentCategoryDataDto extends BaseDto {
     /**
      * 管辖分局组织机构代码
      */
-    @TableField("org_code")
-    private String orgCode;
+    @TableField("org_branch_code")
+    private String org_branch_code;
 
     /**
      * 单位统一信用代码

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/EquipmentCategoryData.java

@@ -19,8 +19,8 @@ public class EquipmentCategoryData extends BaseEntity {
     /**
      * 管辖分局组织机构代码
      */
-    @TableField("org_code")
-    private String orgCode;
+    @TableField("org_branch_code")
+    private String orgBranchCode;
 
     /**
      * 单位统一信用代码

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/EquipmentCategoryMapper.xml

@@ -194,7 +194,7 @@
             bjecd."unit_code" LIKE CONCAT('%',#{companyCode},'%')
         </if>
         <if test="level != 'company'">
-            bjecd."org_code" LIKE CONCAT('%',#{orgCode},'%')
+            bjecd."org_branch_code" LIKE CONCAT('%',#{orgCode},'%')
         </if>
     </select>
 

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -783,11 +783,12 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
 
     @Override
     public List<EquipmentCategoryData> createEquipmentCategoryData(String unitCode) {
+        equipmentCategoryDataService.remove(new QueryWrapper<>());
         List<EquipmentCategoryData> list = new ArrayList<>();
         List<Map<String, Object>> allUnitList = equipmentCategoryMapper.getAllUnit(unitCode);
         for (Map<String, Object> map : allUnitList) {
             EquipmentCategoryData equipmentCategoryData = new EquipmentCategoryData();
-            equipmentCategoryData.setOrgCode(map.get("supervise_org_code").toString());
+            equipmentCategoryData.setOrgBranchCode(map.get("supervise_org_code").toString());
             equipmentCategoryData.setUnitCode(map.get("use_code").toString());
             List<Map<String, Object>> listMap = equipmentCategoryMapper.getCategoryCount("company", null, map.get("use_code").toString());
             for (Map<String, Object> dataMap : listMap) {
@@ -823,9 +824,15 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                         break;
                 }
             }
-            boolean b = equipmentCategoryDataService.saveOrUpdate(equipmentCategoryData,
-                    new QueryWrapper<EquipmentCategoryData>().eq("unit_code", equipmentCategoryData.getUnitCode()));
-            if (b) {
+            EquipmentCategoryData categoryData = equipmentCategoryDataMapper.selectOne(new QueryWrapper<EquipmentCategoryData>().eq("unit_code", equipmentCategoryData.getUnitCode()));
+            int res = 0;
+            if (ObjectUtils.isEmpty(categoryData)) {
+                res = equipmentCategoryDataMapper.insert(equipmentCategoryData);
+            } else {
+                res = equipmentCategoryDataMapper.update(equipmentCategoryData,
+                        new QueryWrapper<EquipmentCategoryData>().eq("unit_code", equipmentCategoryData.getUnitCode()));
+            }
+            if (0 != res) {
                 list.add(equipmentCategoryData);
             }
         }
@@ -906,7 +913,6 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             superviseInfoMapper.update(superviseInfo, new QueryWrapper<SuperviseInfo>().eq("RECORD", map.get("SEQUENCE_NBR").toString()));
         }
         return save;
-
     }
     public Page<JSONObject> queryByKeys(JSONObject map) {
         //根据当前登录人查询
@@ -1020,9 +1026,10 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             query.must(QueryBuilders.matchQuery("ADDRESS", "*" + map.getString("ADDRESS") + "*"));
             boolMust.must(query);
         }
-        if (!ObjectUtils.isEmpty(map.getString("EQU_STATE"))) {
+        if (!ObjectUtils.isEmpty(map.getString("EQU_STATE")) && !("所有设备状态").equals(map.getString("EQU_STATE").toString()) ) {
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-            meBuilder.must(QueryBuilders.matchQuery("EQU_STATE", map.getString("EQU_STATE")));
+            Integer equState = EquimentEnum.getCode.get(map.getString("EQU_STATE"));
+            meBuilder.must(QueryBuilders.matchQuery("EQU_STATE", equState));
             boolMust.must(meBuilder);
         }
         if (!ObjectUtils.isEmpty(map.getString("STATUS"))) {
@@ -1049,7 +1056,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                 }
                 list.add(dto2);
             }
-            totle = getCount("idx_biz_view_jg_all", esClient);
+            totle = response.getInternalResponse().hits().getTotalHits().value;
             result.setRecords(list);
             result.setTotal(totle);
         } catch (IOException e) {
@@ -1063,6 +1070,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         }
         return result;
     }
+
     //es统计总记录数
     public Long getCount(String indexs, RestHighLevelClient esClient) {
         Long totle = 0L;