JensionDzero 1 an în urmă
părinte
comite
74bf2c46ea

+ 1 - 0
ruoyi-demo/src/main/java/com/ruoyi/demo/entity/Commercial.java

@@ -64,5 +64,6 @@ public class Commercial {
         this.prove5 = commercialVo.getProve5();
         this.addrCode = commercialVo.getAddrCode();
         this.addrInfo = commercialVo.getAddrInfo();
+        this.addrCodeInfo = commercialVo.getAddrCodeInfo();
     }
 }

+ 1 - 2
ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/CommercialServiceImpl.java

@@ -55,7 +55,6 @@ public class CommercialServiceImpl implements CommericalService {
     public void addCommercial(CommercialVo commercialVo) {
         Commercial commercial = new Commercial(commercialVo);
         commercial.setCreateTime(DateUtil.date());
-       // commercial.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(commercial.getAddrCode()));
         commercialMapper.insert(commercial);
     }
 
@@ -212,7 +211,7 @@ public class CommercialServiceImpl implements CommericalService {
                 .set("prove_4",commercialVo.getProve4())
                 .set("prove_5",commercialVo.getProve5())
                 .set("addr_code",commercialVo.getAddrCode())
-                .set("addr_code_info",initMapUtil.getInitAddrCodeMap(commercialVo.getAddrCode()))
+                .set("addr_code_info",commercialVo.getAddrCodeInfo())
                 .set("addr_info",commercialVo.getAddrInfo());
             commercialMapper.update(null,updateWrapper);
 

+ 2 - 3
ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/EquipmentServiceImpl.java

@@ -83,7 +83,6 @@ public class EquipmentServiceImpl implements EquipmentService {
         if (aLong == 0){
             Equipment equipment = new Equipment(equipmentVo);
             //1.新增地区码映射
-            //equipment.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(equipment.getAddrCode()));
 
             //2.新增创建时间
             equipment.setEnterTime(DateUtil.date());
@@ -116,7 +115,7 @@ public class EquipmentServiceImpl implements EquipmentService {
                 .set("annotation",equipmentVo.getAnnotation())
                 .set("addr_info",equipmentVo.getAddrInfo())
                 .set("addr_code",equipmentVo.getAddrCode())
-                .set("addr_code_info",equipmentVo.getAddrCode())
+                .set("addr_code_info",equipmentVo.getAddrCodeInfo())
                 .set("state",equipmentVo.getState())
                 .set("on_state",equipmentVo.getOnState())
                 .set("lat",equipmentVo.getLat())
@@ -135,7 +134,7 @@ public class EquipmentServiceImpl implements EquipmentService {
                     .set("equipment_code",equipmentVo.getEquipmentCode())
                     .set("addr_info",equipmentVo.getAddrInfo())
                     .set("addr_code",equipmentVo.getAddrCode())
-                    .set("addr_code_info",equipmentVo.getAddrCode());
+                    .set("addr_code_info",equipmentVo.getAddrCodeInfo());
                 planItemMapper.update(null,updateWrapper1);
             }
 

+ 0 - 1
ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/StoreServiceImpl.java

@@ -45,7 +45,6 @@ public class StoreServiceImpl implements StoreService {
     @Override
     public void addStore(StoreVo storeVo) {
         Store store = new Store(storeVo);
-        //store.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(store.getAddrCode()));
         store.setCreateTime(DateUtil.date());
         storeMapper.insert(store);
     }