Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/java/com/mortals/xhx/module/app/web/AppController.java

@@ -79,8 +79,6 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
         }else{
             entity.setCustUrl("");
         }
-
-
         return super.infoAfter(id, model, entity, context);
     }
 

base-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java

@@ -2,6 +2,7 @@ package com.mortals.xhx.module.dept.service.impl;
 
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.xhx.common.code.SourceEnum;
@@ -62,6 +63,7 @@ public class DeptServiceImpl extends AbstractCRUDCacheServiceImpl<DeptDao, DeptE
     private WindowBusinessService windowBusinessService;
 
 
+
     @Override
     protected String getExtKey(DeptEntity data) {
         return data.getDeptNumber();
@@ -165,4 +167,20 @@ public class DeptServiceImpl extends AbstractCRUDCacheServiceImpl<DeptDao, DeptE
         condition.put("source", SourceEnum.政务网.getValue());
         this.dao.delete(condition);
     }
+
+
+    /**
+     * @param entity
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    protected void updateAfter(DeptEntity entity, Context context) throws AppException {
+        List<WindowEntity> windowEntityList = windowService.find(new WindowQuery().deptId(entity.getId()));
+        windowEntityList.forEach(item->{
+            item.setDeptName(entity.getName());
+        });
+        windowService.update(windowEntityList,context);
+        super.updateAfter(entity, context);
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

@@ -32,11 +32,13 @@ import com.mortals.xhx.module.model.model.ModelEntity;
 import com.mortals.xhx.module.model.model.ModelQuery;
 import com.mortals.xhx.module.model.service.ModelService;
 import com.mortals.xhx.module.site.dao.SiteDao;
-import com.mortals.xhx.module.site.model.SiteEntity;
-import com.mortals.xhx.module.site.model.SiteQuery;
-import com.mortals.xhx.module.site.model.SiteTreeSelect;
+import com.mortals.xhx.module.site.model.*;
 import com.mortals.xhx.module.site.model.vo.SiteAreaVo;
+import com.mortals.xhx.module.site.service.SiteBusinessService;
 import com.mortals.xhx.module.site.service.SiteService;
+import com.mortals.xhx.module.window.model.WindowEntity;
+import com.mortals.xhx.module.window.model.WindowQuery;
+import com.mortals.xhx.module.window.service.WindowService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.logging.Log;
@@ -77,12 +79,36 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
     private UserService userService;
     @Autowired
     private DeptService deptService;
-    @Autowired
-    private MattersService mattersService;
 
     @Autowired
     private MatterService matterService;
 
+    @Autowired
+    private WindowService windowService;
+    @Autowired
+    private SiteBusinessService siteBusinessService;
+
+
+    @Override
+    protected void updateBefore(SiteEntity entity, Context context) throws AppException {
+        //校验下前后名称是否一直 如果不一致 同步修改所以关联
+        SiteEntity siteEntity = this.get(entity.getId(), context);
+        if(!siteEntity.getSiteName().equals(entity.getSiteName())){
+            //todo
+        }
+        //更新窗口名称
+        List<WindowEntity> windowEntityList = windowService.find(new WindowQuery().siteId(entity.getId()));
+        windowEntityList.forEach(item->item.setSiteName(entity.getSiteName()));
+        windowService.update(windowEntityList,context);
+
+        //更新站点业务名称
+        List<SiteBusinessEntity> siteBusinessEntities = siteBusinessService.find(new SiteBusinessQuery().siteId(entity.getId()));
+        siteBusinessEntities.forEach(item->item.setSiteName(entity.getSiteName()));
+        siteBusinessService.update(siteBusinessEntities,context);
+
+        super.updateBefore(entity, context);
+    }
+
     @Override
     protected void validData(SiteEntity entity, Context context) throws AppException {
         if (ObjectUtils.isEmpty(entity.getAreaCode())) {
@@ -242,9 +268,10 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
             userPdu.setPage(1);
             userPdu.setSize(-1);
             Rest<RespData<List<UserPdu>>> list = userFeign.list(userPdu);
-
             userService.updateUserList(list.getData().getData());
         }
+
+
         super.updateAfter(entity, context);
     }
 
@@ -506,4 +533,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         Set<String> secondSet = secondList.parallelStream().map(e -> e.getMatterNo()).collect(Collectors.toSet());
         return firstList.parallelStream().filter(item -> !secondSet.contains(item.getMatterNo())).collect(Collectors.toList());
     }
+
+
 }
\ No newline at end of file