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

base-manager/pom.xml

@@ -144,7 +144,7 @@
                 <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
                 <profiles.log.level>info</profiles.log.level>
                 <package.environment>build</package.environment>
-                <skipUi>false</skipUi>
+                <skipUi>true</skipUi>
                 <profiles.holidayUrl>https://timor.tech/api/holiday/year/</profiles.holidayUrl>
             </properties>
         </profile>

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

@@ -40,20 +40,23 @@ public class SiteMatterServiceImpl extends AbstractCRUDServiceImpl<SiteMatterDao
 
     @Override
     protected void findAfter(SiteMatterEntity params, PageInfo pageInfo, Context context, List<SiteMatterEntity> list) throws AppException {
-        List<Long> matterIdlist = list.stream().map(item -> item.getMatterId()).collect(Collectors.toList());
-        Map<Long, MatterEntity> matterEntityMap = matterService.find(new MatterQuery().idList(matterIdlist)).parallelStream().collect(Collectors.toMap(x -> x.getId(), y -> y, (o, n) -> n));
-        list.forEach(item -> {
-            if (!ObjectUtils.isEmpty(item.getMatterId())) {
-                MatterEntity matterEntity = matterEntityMap.get(item.getMatterId());
-                if (!ObjectUtils.isEmpty(matterEntity)) {
-                    item.setBelongDept(matterEntity.getBelongDept());
-                    item.setWindowToTheSceneNum(matterEntity.getWindowToTheSceneNum());
-                    item.setOnlineToTheSceneNum(matterEntity.getOnlineToTheSceneNum());
-                    item.setDeptCode(matterEntity.getDeptCode());
-                    item.setAreaCode(matterEntity.getAreaCode());
+
+        if (!ObjectUtils.isEmpty(list)) {
+            List<Long> matterIdlist = list.stream().map(item -> item.getMatterId()).collect(Collectors.toList());
+            Map<Long, MatterEntity> matterEntityMap = matterService.find(new MatterQuery().idList(matterIdlist)).parallelStream().collect(Collectors.toMap(x -> x.getId(), y -> y, (o, n) -> n));
+            list.forEach(item -> {
+                if (!ObjectUtils.isEmpty(item.getMatterId())) {
+                    MatterEntity matterEntity = matterEntityMap.get(item.getMatterId());
+                    if (!ObjectUtils.isEmpty(matterEntity)) {
+                        item.setBelongDept(matterEntity.getBelongDept());
+                        item.setWindowToTheSceneNum(matterEntity.getWindowToTheSceneNum());
+                        item.setOnlineToTheSceneNum(matterEntity.getOnlineToTheSceneNum());
+                        item.setDeptCode(matterEntity.getDeptCode());
+                        item.setAreaCode(matterEntity.getAreaCode());
+                    }
                 }
-            }
-        });
+            });
+        }
         super.findAfter(params, pageInfo, context, list);
     }
 

base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowBusinessServiceImpl.java

@@ -168,37 +168,37 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
      */
     @Override
     protected void removeBefore(Long[] ids, Context context) throws AppException {
-        Arrays.asList(ids).forEach(id -> {
+/*        Arrays.asList(ids).forEach(id -> {
             WindowBusinessEntity windowBusinessEntity = this.get(id, context);
             pushChangeMsg(windowBusinessEntity);
-        });
+        });*/
         super.removeBefore(ids, context);
     }
 
 
-    /**
+ /*   *//**
      * @param entity
      * @param context
      * @throws AppException
-     */
+     *//*
     @Override
     protected void saveAfter(WindowBusinessEntity entity, Context context) throws AppException {
         //通知php更新
         pushChangeMsg(entity);
         super.saveAfter(entity, context);
-    }
+    }*/
 
 
-    /**
+/*    *//**
      * @param entity
      * @param context
      * @throws AppException
-     */
+     *//*
     @Override
     protected void updateAfter(WindowBusinessEntity entity, Context context) throws AppException {
         pushChangeMsg(entity);
         super.updateAfter(entity, context);
-    }
+    }*/
 
     private void pushChangeMsg(WindowBusinessEntity entity) {
         String phpUrl = GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_HTTP_URL, "http://172.15.28.116:8090");

base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowServiceImpl.java

@@ -10,6 +10,7 @@ import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.framework.util.HttpUtil;
+import com.mortals.framework.util.ThreadPool;
 import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.module.business.model.BusinessEntity;
 import com.mortals.xhx.module.business.model.BusinessQuery;
@@ -132,7 +133,24 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
             }
             return windowBusinessEntity;
         }).filter(f -> f != null).collect(Collectors.toList());
-        windowBusinessService.save(windowBusinessEntities, context);
+
+        if (!ObjectUtils.isEmpty(windowBusinessEntities)) {
+            windowBusinessService.save(windowBusinessEntities, context);
+
+            WindowBusinessQuery condition = new WindowBusinessQuery();
+            condition.setWindowId(windowId);
+            condition.setSiteBusinessIdList(windowBusinessEntities.stream().map(i -> i.getSiteBusinessId()).collect(Collectors.toList()));
+
+            Runnable runnable = new Runnable() {
+                @Override
+                public void run() {
+                    pushChangeMsg(condition);
+                }
+            };
+            ThreadPool.getInstance().execute(runnable);
+        }
+
+        //批量推送
     }
 
     /**
@@ -220,25 +238,6 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
         pushChangeMsg(entity.getId());
     }
 
-    private void pushChangeMsg(Long windowId) {
-        String phpUrl = GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_HTTP_URL, "http://172.15.28.116:8090");
-        phpUrl += "/api/window/winNameChange";
-        HashMap<String, Object> paramsMap = new HashMap<>();
-        paramsMap.put("windowid", windowId);
-        paramsMap.put("typeinfo", 1);
-
-        phpUrl += "/api/window/winNameChange";
-        String resp = null;
-        try {
-            Map<String, String> header = new HashMap<>();
-            header.put(HEADER_CONTENT_TYPE, "application/json");
-            log.info("\n thirdPartyUrl=>{} \n reqbody=>{} ", phpUrl, JSON.toJSONString(paramsMap));
-            resp = HttpUtil.doPost(phpUrl, header, JSON.toJSONString(paramsMap, SerializerFeature.WriteMapNullValue));
-            log.info("thirdPartyUrl =>resp:{}", resp);
-        } catch (Exception e) {
-            log.error("异常:", e);
-        }
-    }
 
 
     /**
@@ -272,4 +271,46 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
         }
         return successMsg.toString();
     }
+
+
+    private void pushChangeMsg(Long windowId) {
+        String phpUrl = GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_HTTP_URL, "http://127.0.0.1:11078/zwfw_api");
+        phpUrl += "/api/window/winNameChange";
+        HashMap<String, Object> paramsMap = new HashMap<>();
+        paramsMap.put("windowid", windowId);
+        paramsMap.put("typeinfo", 1);
+
+        phpUrl += "/api/window/winNameChange";
+        String resp = null;
+        try {
+            Map<String, String> header = new HashMap<>();
+            header.put(HEADER_CONTENT_TYPE, "application/json");
+            log.info("\n thirdPartyUrl=>{} \n reqbody=>{} ", phpUrl, JSON.toJSONString(paramsMap));
+            resp = HttpUtil.doPost(phpUrl, header, JSON.toJSONString(paramsMap, SerializerFeature.WriteMapNullValue));
+            log.info("thirdPartyUrl =>resp:{}", resp);
+        } catch (Exception e) {
+            log.error("异常:", e);
+        }
+    }
+
+
+    private void pushChangeMsg(WindowBusinessQuery entity) {
+        String phpUrl = GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_HTTP_URL, "http://127.0.0.1:11078/zwfw_api");
+        phpUrl += "/api/window/winNameChange";
+        HashMap<String, Object> paramsMap = new HashMap<>();
+        paramsMap.put("windowid", entity.getWindowId());
+        paramsMap.put("bussinessid", entity.getSiteBusinessIdList().stream().map(String::valueOf).collect(Collectors.joining(",")));
+
+        paramsMap.put("typeinfo", 2);
+        String resp = null;
+        try {
+            Map<String, String> header = new HashMap<>();
+            header.put(HEADER_CONTENT_TYPE, "application/json");
+            log.info("\n thirdPartyUrl=>{} \n reqbody=>{} ", phpUrl, JSON.toJSONString(paramsMap));
+            resp = HttpUtil.doPost(phpUrl, header, JSON.toJSONString(paramsMap, SerializerFeature.WriteMapNullValue));
+            log.info("thirdPartyUrl =>resp:{}", resp);
+        } catch (Exception e) {
+            log.error("异常:", e);
+        }
+    }
 }
\ No newline at end of file

base-manager/src/main/resources/config/mybatis-sqlmap-config.xml

@@ -19,7 +19,7 @@
 		</plugin>
 		<plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor">
 			<property name="enableExecutorTime" value="true" />
-			<property name="showSql" value="false" />
+			<property name="showSql" value="true" />
 		</plugin>
 	</plugins>
 </configuration>
\ No newline at end of file

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

@@ -20,9 +20,12 @@ POST {{baseUrl}}/matter/list
 Content-Type: application/json
 
 {
-  "siteId": 22,
+  "siteId": 1,
+  "matterName": "%%",
   "page": 1,
-  "size": 2
+  "size": 10,
+  "deptCode":"zyl",
+  "source": ""
 }
 
 ###微官网事项列表