添加更新基础区域

agent-manager/src/main/java/com/mortals/xhx/module/base/model/BaseAreaEntity.java

@@ -291,27 +291,27 @@ public class BaseAreaEntity extends BaseAreaVo {
 
             this.ancestors = "";
 
-            this.name = null;
+            this.name = "";
 
-            this.iid = null;
+            this.iid = "";
 
-            this.pid = null;
+            this.pid = "";
 
-            this.haveSonArea = null;
+            this.haveSonArea = "";
 
-            this.haveSonDept = null;
+            this.haveSonDept = "";
 
-            this.haveGetDept = null;
+            this.haveGetDept = "";
 
-            this.haveGetMatterList = null;
+            this.haveGetMatterList = "";
 
-            this.areaCode = null;
+            this.areaCode = "";
 
             this.areaLevel = 1;
 
-            this.shortName = null;
+            this.shortName = "";
 
-            this.domain = null;
+            this.domain = "";
 
             this.status = 1;
     }

agent-manager/src/main/java/com/mortals/xhx/module/base/service/impl/BaseAreaServiceImpl.java

@@ -19,6 +19,7 @@ import com.mortals.xhx.module.base.model.BaseAreaQuery;
 import com.mortals.xhx.module.base.model.vo.GroupAreaInfo;
 import com.mortals.xhx.module.base.model.vo.RootAreaInfo;
 import com.mortals.xhx.module.base.service.BaseAreaService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,6 +37,7 @@ import java.util.stream.Collectors;
  * @date 2022-11-22
  */
 @Service("baseAreaService")
+@Slf4j
 public class BaseAreaServiceImpl extends AbstractCRUDServiceImpl<BaseAreaDao, BaseAreaEntity, Long> implements BaseAreaService {
 
     @Autowired
@@ -130,9 +132,11 @@ public class BaseAreaServiceImpl extends AbstractCRUDServiceImpl<BaseAreaDao, Ba
         BaseAreaEntity entity = this.selectOne(baseAreaQuery);
         if (ObjectUtils.isEmpty(entity)) {
             //新增
+
             entity = new BaseAreaEntity();
             entity.initAttrValue();
             BeanUtils.copyProperties(group, entity, BeanUtil.getNullPropertyNames(group));
+            //log.info("新增数据:{}", JSON.toJSONString(group));
             this.save(entity);
         } else {
             //更新

agent-manager/src/main/java/com/mortals/xhx/module/base/web/BaseAreaController.java

@@ -112,9 +112,9 @@ public class BaseAreaController extends BaseCRUDJsonBodyMappingController<BaseAr
                 throw new AppException("当前初始区域编码或名称为空！");
             }
 
-            new Thread(() -> {
-                this.service.updateArea(areaQuery, getContext());
-            }).start();
+            this.service.updateArea(areaQuery, getContext());
+     /*       new Thread(() -> {
+            }).start();*/
 
             //编码优先
             //this.service.updateArea(areaQuery, getContext());

agent-manager/src/test/java/com/mortals/httpclient/MatterController.http

-
-
-
-###事项列表
-POST {{baseUrl}}/basics_api/base/matter/interlist
-Content-Type: application/json
-
-{
-  "areaLevel": 2
-
-}
-
-
-###生成文本
-POST {{baseUrl}}/matter/genMatterTxt
-Content-Type: application/json
-
-{"areaCode": "511124000000","areaLevel": 3}
-
-
-###生成文本1
-POST {{baseUrl}}/matter/genMatterMarkdown
-Content-Type: application/json
-
-{"areaCode": "510300000000",
-  "genFilePath": "/home/md/",
-  "isSub": 1
-
-}
-
-
-###基础事项列表
-POST {{baseUrl}}/site/matter/interlist
-Content-Type: application/json
-
-{
-  "page": 1,
-  "size": 10,
-  "siteId": 1,
-  "matterName": "特种设备作业人员资格认定取证"
-}
-
-###微官网事项列表
-POST {{baseUrl}}/micro/matter/list
-Content-Type: application/json
-
-{
-  "page": 1,
-  "size": 10
-}
-
-###基础事项差集列表
-POST {{baseUrl}}/matter/sublist
-Content-Type: application/json
-
-{
-
-  "siteId": 1,
-  "source": 0,
-  "page": 1,
-  "size": 10
-}
-
-
-###基础事项更新与保存
-POST {{baseUrl}}/matter/save
-Content-Type: application/json
-
-{
-  "siteId": 1133,
-  "tid": "8v8deo",
-  "tcode": "p96sww",
-  "tname": "p4ndzl",
-  "matterName": "r57jb0",
-  "englishName": "wzv5to",
-  "matterNo": "1a99b3",
-  "belongDept": "r1cq5m",
-  "appoveObjectShow": "l2gb3b",
-  "operatScopeShow": "s8rnid",
-  "appoveTimeLimitShow": "u4ma68",
-  "handleType": "67gb40",
-  "legalTimeLimitShow": "tc0poc",
-  "legalEndExplain": "gf4uyf",
-  "promiseTimeLimitShow": "6ojk60",
-  "promiseEndExplain": "tzyuh9",
-  "isChargesShow": "9a75oa",
-  "certificationLevelsShow": "52xc9a",
-  "planTakeTime": "2022-01-20",
-  "promiseTakeTime": "2022-01-20",
-  "specialProcedure": "tllpqj",
-  "windowToTheSceneNum": 5231,
-  "isOnlineSubscribeShow": "vu024q",
-  "isExpressTakeShow": "2k7dgu",
-  "isProvinceAcquisitionShow": "l4rpah",
-  "isApplyProvinceShow": "qbsqqn",
-  "mustSceneExplain": "7fkf9b",
-  "onlineType": "a3rnek",
-  "onlineToTheSceneNum": 6882,
-  "onlineOperatDeep": "3uqt1d",
-  "isExpressTakeOnlineShow": "604g6o",
-  "isDoorTakeShow": "0ah92q",
-  "onlineMustSceneExplain": "qu3raq",
-  "performDeptType": "3rq5l1",
-  "matterEdition": "a2kox8",
-  "eventTypeShow": "njfkbg",
-  "performHierarchyShow": "xqq5gb",
-  "powerSourceShow": "6d5ten",
-  "performDeptTypeShow": "phbyz5",
-  "goveServiceCenterShow": "d83aox",
-  "isConvenientCenterShow": "o07ptk",
-  "terminalHandle": "fiq3wb",
-  "isOnline": "hpxfs7",
-  "isOnlinePayShow": "xnwpjq",
-  "entrustmentDepartmen": "bw1f7a",
-  "jointInfoShow": "qc4hu9",
-  "matterStatus": "2715ip",
-  "numberLimit": 1149,
-  "type": "hlwxqn",
-  "baseCode": "s6md25",
-  "implementCode": "yul933",
-  "implementBodyCode": "25gon6",
-  "operateItemCode": "5ybgsu",
-  "townshipName": "l0qphj",
-  "townshipCode": "5l6oak",
-  "villageName": "a6fqny",
-  "villageCode": "fcu6cw",
-  "operateTime": "aodi3k",
-  "operateSite": "gc3mm4",
-  "cousultingShow": "z2nn2v",
-  "cousultingTelephoneShow": "v5vah1",
-  "superviseShow": "i7bhin",
-  "sort": 2139,
-  "source": 4596
-}
-
-> {%
-client.global.set("Matter_id", JSON.parse(response.body).data.id);
-%}
-
-###基础事项查看
-GET {{baseUrl}}/matter/interinfo?id=40248
-Accept: application/json
-
-###基础事项编辑
-GET {{baseUrl}}/matter/edit?id={{Matter_id}}
-Accept: application/json
-
-
-###基础事项删除
-GET {{baseUrl}}/matter/delete?id={{Matter_id}}
-Accept: application/json
-
-
-
-