添加站点主题事项

base-manager/src/main/java/com/mortals/xhx/common/utils/SyncGovMatterDetailThread.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSON;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICacheService;
-import com.mortals.xhx.ManagerBaseApplication;
 import com.mortals.xhx.common.code.DxTypeEnum;
 import com.mortals.xhx.common.code.SourceEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
@@ -24,12 +23,8 @@ import com.mortals.xhx.module.site.service.SiteService;
 import com.mortals.xhx.module.site.service.SiteThemeMatterService;
 import com.mortals.xhx.module.site.service.SiteThemeService;
 import com.mortals.xhx.utils.SpringUtils;
-import lombok.AllArgsConstructor;
-import lombok.CustomLog;
 import lombok.extern.apachecommons.CommonsLog;
-import lombok.extern.slf4j.Slf4j;
 
-import javax.xml.transform.Source;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -91,7 +86,7 @@ public class SyncGovMatterDetailThread implements Runnable {
             //重新添加
             for (SiteEntity site : siteEntities) {
                 List<SiteMatterEntity> siteMatterList = matterEntityList.stream().map(item -> {
-                    return matterService.switchMatterToSiteMatterr(item, site, context).getData();
+                    return matterService.switchMatterToSiteMatter(item, site, context).getData();
                 }).filter(f -> f != null).collect(Collectors.toList());
 
                 List<List<SiteMatterEntity>> partition = ListUtil.partition(siteMatterList, 100);

base-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterService.java

@@ -5,16 +5,12 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
-import com.mortals.framework.service.ICRUDCacheService;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.matter.model.MatterQuery;
 import com.mortals.xhx.module.matter.model.vo.MatterInfo;
 import com.mortals.xhx.module.site.model.SiteEntity;
 import com.mortals.xhx.module.site.model.SiteMatterEntity;
-import com.mortals.xhx.module.site.model.SiteMatterQuery;
-import org.apache.poi.ss.formula.functions.T;
-import org.w3c.dom.Document;
 
 import java.util.Map;
 
@@ -58,14 +54,21 @@ public interface MatterService extends ICRUDService<MatterEntity, Long> {
     Rest<String> buildMatterDetail(MatterEntity matterEntity, Context context);
 
     /**
-     * 添加业务到站点
+     * 添加事项到站点事项
      *
      * @param matterEntity
      * @param context
      */
-    Rest<SiteMatterEntity> switchMatterToSiteMatterr(MatterEntity matterEntity, SiteEntity siteEntity, Context context);
-
+    Rest<SiteMatterEntity> switchMatterToSiteMatter(MatterEntity matterEntity, SiteEntity siteEntity, Context context);
 
+    /**
+     * 查找差集子项
+     * @param matterQuery
+     * @param pageInfo
+     * @param context
+     * @return
+     * @throws AppException
+     */
     Result<MatterEntity> findSubList(MatterEntity matterQuery, PageInfo pageInfo, Context context) throws AppException;
 
     Result<MatterInfo> findMicroList(MatterQuery matterQuery, PageInfo pageInfo, Context context) throws AppException;

base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

@@ -11,7 +11,6 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
-import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.util.DataUtil;
 import com.mortals.xhx.base.framework.config.InterceptorConfig;
@@ -93,7 +92,13 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
 
     @Override
     protected void saveBefore(MatterEntity entity, Context context) throws AppException {
-
+        //判断如果是自定义事项，需要更新区域编码
+        if(SourceEnum.自定义.getValue().equals(entity.getSource())){
+            if(!ObjectUtils.isEmpty(entity.getSiteId())){
+                SiteEntity siteEntity = siteService.get(entity.getSiteId(), context);
+                entity.setAreaCode(siteEntity.getAreaCode());
+            }
+        }
         super.saveBefore(entity, context);
     }
 
@@ -169,7 +174,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
         SiteMatterEntity siteMatterEntity = siteMatterService.selectOne(new SiteMatterQuery().siteId(siteId).matterId(item.getId()));
         if (ObjectUtils.isEmpty(siteMatterEntity)) {
             SiteEntity siteEntity = siteService.getCache(siteId.toString());
-            Rest<SiteMatterEntity> rest = switchMatterToSiteMatterr(item, siteEntity, context);
+            Rest<SiteMatterEntity> rest = switchMatterToSiteMatter(item, siteEntity, context);
             if (rest.getCode() == YesNoEnum.YES.getValue()) {
                 return rest.getData();
             }
@@ -178,7 +183,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
     }
 
     @Override
-    public Rest<SiteMatterEntity> switchMatterToSiteMatterr(MatterEntity item, SiteEntity siteEntity, Context context) {
+    public Rest<SiteMatterEntity> switchMatterToSiteMatter(MatterEntity item, SiteEntity siteEntity, Context context) {
         try {
             DeptEntity deptEntity = deptService.getExtCache(item.getDeptCode());
             SiteMatterEntity siteMatterEntity = new SiteMatterEntity();

base-manager/src/main/resources/logback-spring.xml

@@ -56,13 +56,13 @@
     <!-- level 用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。如果未设置此属性，那么当前logger将会继承上级的级别-->
     <!-- additivity 是否向上级logger传递打印信息。默认是true。false：表示只用当前logger的appender-ref。true：表示当前logger的appender-ref和rootLogger的appender-ref都有效。-->
 
-    <logger name="com.mortals" level="INFO" additivity="false">
+    <logger name="com.mortals" level="${logLevel}" additivity="false">
         <appender-ref ref="console"/>
         <appender-ref ref="fileInfo"/>
         <appender-ref ref="fileError"/>
     </logger>
 
-    <logger name="com.mortals.xhx.module" level="debug" additivity="false">
+    <logger name="com.mortals.xhx.module" level="${logLevel}" additivity="false">
         <appender-ref ref="console"/>
         <appender-ref ref="fileInfo"/>
         <appender-ref ref="fileError"/>

base-manager/src/test/java/com/mortals/httpclient/business/BusinessMatterController.http

@@ -5,7 +5,7 @@ Content-Type: application/json
 
 {
   "page": 1,
-  "siteBusinessName": "%不动产抵押登记%",
+  "matterId": 123,
   "siteId": 53,
   "size": 10
 }

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

@@ -20,7 +20,9 @@ POST {{baseUrl}}/matter/list
 Content-Type: application/json
 
 {
-  "idList": [1,2],
+  "siteId": "",
+  "matterName": "%对墓穴占地面积超过标准的处罚%",
+  "deptCode":"",
   "page": 1,
   "size": 10
 }
@@ -30,7 +32,7 @@ POST {{baseUrl}}/micro/matter/list
 Content-Type: application/json
 
 {
-  "idList": [1,2],
+  "matterName": "%对墓穴占地面积超过标准的处罚%",
   "page": 1,
   "size": 10
 }
@@ -124,7 +126,7 @@ client.global.set("Matter_id", JSON.parse(response.body).data.id);
 %}
 
 ###基础事项查看
-GET {{baseUrl}}/matter/info?id=1
+GET {{baseUrl}}/matter/info?id=5809
 Accept: application/json
 
 ###基础事项编辑

base-manager/src/test/java/com/mortals/httpclient/site/SiteMatterController.http

@@ -4,7 +4,8 @@ POST {{baseUrl}}/site/matter/list
 Content-Type: application/json
 
 {
-    "siteId":21 ,
+    "siteId":35,
+    "matterId": 5809,
     "page":1,
     "size":10
 }

base-manager/src/test/java/com/mortals/httpclient/site/SiteThemeMatterController.http

@@ -4,7 +4,7 @@ Content-Type: application/json
 
 {
 "loginName":"admin",
-"password":"admin",
+"password":"adsmile",
 "securityCode":"8888"
 }
 
@@ -15,19 +15,11 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###站点主题事项列表
 POST {{baseUrl}}/site/theme/matter/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-    "siteId":41,
-    "siteName":"fzbhd9",
-    "matterId":736,
-    "matterName":"dhnjnq",
-    "matterCode":"g61fxt",
-    "userType":"xd2eec",
-    "themeCode":"60d2h2",
-    "themeName":"gcfnnz",
-    "source":261,
+    "siteId":3,
+    "matterId":5809,
     "page":1,
     "size":10
 }
@@ -55,7 +47,7 @@ client.global.set("SiteThemeMatter_id", JSON.parse(response.body).data.id);
 %}
 
 ###站点主题事项查看
-GET {{baseUrl}}/site/theme/matter/info?id={{SiteThemeMatter_id}}
+GET {{baseUrl}}/site/theme/matter/info?id=52237
 Authorization: {{authToken}}
 Accept: application/json
 

deploy.sh

@@ -272,8 +272,8 @@ socket=/tmp/mysql.sock
   #bin/mysqld --initialize-insecure --user=mysql --datadir=${MYSQL_DATA_PATH} --basedir=${MYSQL_EXECPATH} --socket=/tmp/mysql.sock
 
   #创建软连接
-  rm -m /etc/init.d/mysql
-  rm -m /usr/bin/mysql
+  rm -f /etc/init.d/mysql
+  rm -f /usr/bin/mysql
   ln -s ${MYSQL_EXECPATH}/support-files/mysql.server /etc/init.d/mysql
   ln -s ${MYSQL_EXECPATH}/bin/mysql /usr/bin/mysql
 #  export PATH=$PATH:${MYSQL_EXECPATH}/bin
@@ -282,6 +282,8 @@ socket=/tmp/mysql.sock
 #  mysql -uroot -p123 <${BASEDIR}/soft/${MYSQL}/user.sql
 #  sed -i "s/skip-grant-tables/#skip-grant-tables/g" ${MYSQL_CONF_PATH}
   #service mysql restart
+
+  writelog $MYSQL_SERVICE
   echo"
 [Unit]
 Description=MySQL Server
@@ -298,7 +300,7 @@ ExecReload= /etc/init.d/mysql restart
 LimitNOFILE = 5000
 [Install]
 WantedBy=multi-user.target
-  ">${MYSQL_CONF_PATH}
+  ">${MYSQL_SERVICE}
 
   systemctl enable mysql
   systemctl daemon-reload