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

base-manager/db/base_modules.sql

-use
-`base-platform`;
+use `base-platform`;
 -- ----------------------------
 -- 模块表
 -- ----------------------------
@@ -143,26 +142,29 @@ CREATE TABLE `mortals_sys_site_business`
 -- 站点事项表
 -- ----------------------------
 DROP TABLE IF EXISTS `mortals_sys_site_matter`;
-CREATE TABLE mortals_sys_site_matter
-(
-    `id`           bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
-    `siteId`       bigint(20) COMMENT '站点ID',
-    `siteName`     varchar(255) COMMENT '站点名称',
-    `matterId`     bigint(20) COMMENT '事项ID',
-    `matterName`   varchar(1024) COMMENT '事项名称',
-    `matterCode`   varchar(512) COMMENT '事项编码',
-    `deptId`       bigint(20) COMMENT '部门ID',
-    `deptName`     varchar(64) COMMENT '部门名称',
-    `source`       tinyint(2) COMMENT '事项来源',
-    `deptCode`     varchar(255) COMMENT '部门编号',
-    `createTime`   datetime COMMENT '创建时间',
-    `createUserId` bigint(20) COMMENT '创建用户',
-    `updateTime`   datetime COMMENT '修改时间',
-    PRIMARY KEY (`id`)
+CREATE TABLE mortals_sys_site_matter(
+    `id` bigint(20)   AUTO_INCREMENT  COMMENT '序号，主键，自增长',
+    `siteId` bigint(20)     COMMENT '站点ID',
+    `siteName` varchar(255)     COMMENT '站点名称',
+    `matterId` bigint(20)     COMMENT '事项ID',
+    `matterName` varchar(1024)     COMMENT '事项名称',
+    `matterCode` varchar(512)     COMMENT '事项编码',
+    `deptId` bigint(20)     COMMENT '部门ID',
+    `deptName` varchar(64)     COMMENT '部门名称',
+    `eventTypeShow` varchar(255)     COMMENT '事项类型',
+    `source` tinyint(2)     COMMENT '事项来源',
+    `deptCode` varchar(255)     COMMENT '部门编号',
+    `createTime` datetime     COMMENT '创建时间',
+    `createUserId` bigint(20)     COMMENT '创建用户',
+    `updateTime` datetime     COMMENT '修改时间',
+    PRIMARY KEY  (`id`),
+    KEY `mattercode` (`matterCode`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='站点事项';
 
 
 
+
+
 -- ----------------------------
 -- 业务事项关联表
 -- ----------------------------
@@ -401,7 +403,9 @@ CREATE TABLE mortals_sys_matter(
    `createTime` datetime     COMMENT '创建时间',
    `createUserId` bigint(20)     COMMENT '创建用户',
    `updateTime` datetime     COMMENT '修改时间',
-   PRIMARY KEY  (`id`)
+   PRIMARY KEY  (`id`),
+   UNIQUE KEY `站点事项编码` (`matterNo`,`areaCode`) USING BTREE,
+   KEY `区域` (`areaCode`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='基础事项';
 
 

base-manager/pom.xml

@@ -191,11 +191,6 @@
             <version>0.4.5</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>RELEASE</version>
-        </dependency>
 
         <dependency>
             <groupId>junit</groupId>

base-manager/src/main/java/com/mortals/xhx/module/matter/dao/MatterDao.java

 package com.mortals.xhx.module.matter.dao;
 
 import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
 import com.mortals.xhx.module.matter.model.MatterEntity;
+import org.apache.poi.ss.formula.functions.T;
+
 import java.util.List;
+
 /**
-* 基础事项Dao
-* 基础事项 DAO接口
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public interface  MatterDao extends ICRUDDao<MatterEntity,Long>{
+ * 基础事项Dao
+ * 基础事项 DAO接口
+ *
+ * @author zxfei
+ * @date 2022-01-12
+ */
+public interface MatterDao extends ICRUDDao<MatterEntity, Long> {
 
+    String SQLID_SUB_LIST = "getSubList";
+    String SQLID_SUB_COUNT = "getSubListCount";
 
+    Result<MatterEntity> getSubList(MatterEntity matterQuery, PageInfo pageInfo);
 }

base-manager/src/main/java/com/mortals/xhx/module/matter/dao/ibatis/MatterDaoImpl.java

 package com.mortals.xhx.module.matter.dao.ibatis;
 
 
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.ParamDto;
+import com.mortals.framework.model.Result;
+import org.apache.ibatis.session.RowBounds;
 import org.springframework.stereotype.Repository;
 import com.mortals.xhx.module.matter.dao.MatterDao;
 import com.mortals.xhx.module.matter.model.MatterEntity;
+
+import java.util.ArrayList;
 import java.util.Date;
+
 import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+
 import java.util.List;
+
 /**
-* 基础事项DaoImpl DAO接口
-*
-* @author zxfei
-* @date 2022-01-12
-*/
+ * 基础事项DaoImpl DAO接口
+ *
+ * @author zxfei
+ * @date 2022-01-12
+ */
 @Repository("matterDao")
-public class MatterDaoImpl extends BaseCRUDDaoMybatis<MatterEntity,Long> implements MatterDao {
+public class MatterDaoImpl extends BaseCRUDDaoMybatis<MatterEntity, Long> implements MatterDao {
 
 
+    @Override
+    public Result<MatterEntity> getSubList(MatterEntity matterQuery, PageInfo pageInfo) {
+        Result<MatterEntity> result = new Result();
+        ParamDto paramDto = this.getQueryParam(matterQuery);
+        int count = this.getSubCount(paramDto);
+        List list = null;
+        if (count == 0) {
+            list = new ArrayList();
+        } else if (pageInfo.getPrePageResult() == -1) {
+            list = this.getSqlSession().selectList(this.getSqlId(SQLID_SUB_LIST), paramDto);
+        } else {
+            RowBounds rowBounds = new RowBounds(pageInfo.getBeginIndex(), pageInfo.getPrePageResult());
+            list = this.getSqlSession().selectList(this.getSqlId(SQLID_SUB_LIST), this.cpyQueryParamDto(paramDto), rowBounds);
+        }
+        pageInfo.setTotalResult(count);
+        result.setPageInfo(pageInfo);
+        result.setList(list);
+        return result;
+    }
 
+    public int getSubCount(ParamDto paramDto) {
+        return this.getSqlSession().selectOne(this.getSqlId(SQLID_SUB_COUNT), this.cpyQueryParamDto(paramDto));
+    }
 }

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

 package com.mortals.xhx.module.matter.service;
 import com.mortals.framework.common.Rest;
+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.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;
@@ -27,7 +32,6 @@ public interface MatterService extends ICRUDCacheService<MatterEntity,Long> {
      */
     Rest<String> addMatterToSite(String matterIds, Long siteId, Context context);
 
-
     /**
      * 同步政务网事项数据
      * @param areaCode
@@ -35,20 +39,10 @@ public interface MatterService extends ICRUDCacheService<MatterEntity,Long> {
      */
     void syncMatter(String areaCode,Context context);
 
-
     Map<String,String> getBaseInfoMap(Context context);
 
     Map<String,String> getSqclInfoMap(Context context);
 
-
-//    /**
-//     * 解析事项材料信息
-//     * @param dom
-//     * @return
-//     */
-//    Map<String,String> getclxiInfoMapByHtml(Document dom);
-
-
     /**
      * 构建事项详细相关信息
      * @param matterEntity
@@ -56,8 +50,6 @@ public interface MatterService extends ICRUDCacheService<MatterEntity,Long> {
      */
     Rest<String> buildMatterDetail(MatterEntity matterEntity, Context context);
 
-
-
     /**
      * 添加业务到站点
      * @param matterEntity
@@ -66,4 +58,7 @@ public interface MatterService extends ICRUDCacheService<MatterEntity,Long> {
      */
     Rest<SiteMatterEntity> switchMatterToSiteMatterr(MatterEntity matterEntity, Long siteId, Context context);
 
+
+
+    Result<MatterEntity> findSubList(MatterEntity matterQuery, PageInfo pageInfo, Context context) throws AppException;
 }
\ No newline at end of file

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

@@ -10,6 +10,7 @@ import com.mortals.framework.common.Rest;
 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.util.DataUtil;
 import com.mortals.xhx.base.framework.config.InterceptorConfig;
@@ -197,6 +198,11 @@ public class MatterServiceImpl extends AbstractCRUDCacheServiceImpl<MatterDao, M
         }
     }
 
+    @Override
+    public Result<MatterEntity> findSubList(MatterEntity matterQuery, PageInfo pageInfo, Context context) throws AppException {
+        return this.dao.getSubList(matterQuery, pageInfo);
+    }
+
 
     @Override
     public void syncMatter(String areaCode, Context context) {

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java

@@ -2,8 +2,11 @@ package com.mortals.xhx.module.matter.web;
 
 import cn.hutool.setting.Setting;
 import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
 import com.mortals.framework.util.DataUtil;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
@@ -11,6 +14,7 @@ import com.mortals.xhx.base.framework.config.InterceptorConfig;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.matter.service.MatterService;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,6 +26,9 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static com.mortals.framework.ap.SysConstains.MESSAGE_INFO;
+import static com.mortals.framework.ap.SysConstains.PAGEINFO_KEY;
+
 /**
  * 基础事项
  *
@@ -124,4 +131,33 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
         return jsonObject.toJSONString();
     }
 
+
+    @PostMapping(value = "sublist")
+    @UnAuth
+    public Rest<Object> sublist(@RequestBody MatterEntity query) {
+        Rest<Object> ret = new Rest<>();
+        Map<String, Object> model = new HashMap<>();
+        Context context = this.getContext();
+        String busiDesc = "查询差集" + this.getModuleDesc();
+        int code=VALUE_RESULT_SUCCESS;
+        try {
+            PageInfo pageInfo = buildPageInfo(query);
+            Result<MatterEntity> result = this.getService().findSubList(query, pageInfo, context);
+            model.put(KEY_RESULT_DATA, result.getList());
+            model.put(PAGEINFO_KEY, result.getPageInfo());
+            parsePageInfo(model, result.getPageInfo());
+            model.put(MESSAGE_INFO, busiDesc + "成功");
+            recordSysLog(request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            code = VALUE_RESULT_FAILURE;
+            this.doException(request, busiDesc, model, e);
+        }
+        this.init(model, context);
+        ret.setCode(code);
+        ret.setData(model);
+        ret.setDict(model.get(KEY_RESULT_DICT));
+        ret.setMsg(model.get(MESSAGE_INFO) == null ? "" : model.remove(MESSAGE_INFO).toString());
+        return ret;
+    }
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinBaseServiceImpl.java

@@ -20,17 +20,18 @@ import com.mortals.xhx.module.skin.model.SkinFieldQuery;
 import com.mortals.xhx.module.skin.service.SkinBaseService;
 import com.mortals.xhx.module.skin.service.SkinFieldService;
 import freemarker.template.Template;
-import org.apache.http.entity.ContentType;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileItemFactory;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.StringWriter;
+import java.io.*;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -76,7 +77,7 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
             List<SkinFieldEntity> skinFieldEntities = skinFieldService.find(new SkinFieldQuery().skinId(item.getId()));
             ProductEntity productEntity = productService.get(item.getProductId());
             item.setProductCode(productEntity == null ? "" : productEntity.getProductCode());
-            item.setImageResolutionValue(imageResolutionMap.get(entity.getImageResolution()==null?"1":entity.getImageResolution()));
+            item.setImageResolutionValue(imageResolutionMap.get(entity.getImageResolution() == null ? "1" : entity.getImageResolution()));
             item.setSkinFieldList(skinFieldEntities);
 
             if (!ObjectUtils.isEmpty(item.getPreviewImagePath())) {
@@ -165,7 +166,8 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
             template.process(data, sw);
 
             InputStream inputStream = new ByteArrayInputStream(sw.toString().getBytes(Constant.UTF8));
-            MultipartFile file = new MockMultipartFile("file.css", "file.css", ContentType.APPLICATION_OCTET_STREAM.toString(), inputStream);
+            MultipartFile file = getMultipartFile(inputStream, "file.css");
+            // MultipartFile file = new MockMultipartFile("file.css", "file.css", ContentType.APPLICATION_OCTET_STREAM.toString(), inputStream);
             String filePath = uploadService.saveFileUpload(file, "file/fileupload", context.getUser());
             entity.setCssFilePath(filePath);
 
@@ -175,4 +177,64 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
         }
 
     }
+
+    /**
+     * 获取封装得MultipartFile
+     *
+     * @param inputStream inputStream
+     * @param fileName    fileName
+     * @return MultipartFile
+     */
+    public MultipartFile getMultipartFile(InputStream inputStream, String fileName) {
+        FileItem fileItem = createFileItem(inputStream, fileName);
+        //CommonsMultipartFile是feign对multipartFile的封装，但是要FileItem类对象
+        return new CommonsMultipartFile(fileItem);
+    }
+
+
+    /**
+     * FileItem类对象创建
+     *
+     * @param inputStream inputStream
+     * @param fileName    fileName
+     * @return FileItem
+     */
+    public FileItem createFileItem(InputStream inputStream, String fileName) {
+        FileItemFactory factory = new DiskFileItemFactory(16, null);
+        String textFieldName = "file";
+        FileItem item = factory.createItem(textFieldName, MediaType.MULTIPART_FORM_DATA_VALUE, true, fileName);
+        int bytesRead = 0;
+        byte[] buffer = new byte[10 * 1024 * 1024];
+        OutputStream os = null;
+        //使用输出流输出输入流的字节
+        try {
+            os = item.getOutputStream();
+            while ((bytesRead = inputStream.read(buffer, 0, 8192)) != -1) {
+                os.write(buffer, 0, bytesRead);
+            }
+            inputStream.close();
+        } catch (IOException e) {
+            log.error("Stream copy exception", e);
+            throw new IllegalArgumentException("文件上传失败");
+        } finally {
+            if (os != null) {
+                try {
+                    os.close();
+                } catch (IOException e) {
+                    log.error("Stream close exception", e);
+
+                }
+            }
+            if (inputStream != null) {
+                try {
+                    inputStream.close();
+                } catch (IOException e) {
+                    log.error("Stream close exception", e);
+                }
+            }
+        }
+
+        return item;
+    }
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinBaseController.java

 package com.mortals.xhx.module.skin.web;
+import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.key.Constant;
 import com.mortals.xhx.module.product.model.ProductEntity;
 import com.mortals.xhx.module.product.model.ProductQuery;
 import com.mortals.xhx.module.product.service.ProductService;
@@ -66,8 +68,6 @@ public class SkinBaseController extends BaseCRUDJsonBodyMappingController<SkinBa
                 query.setProductCode(null);
             }
         }
-
-
         super.doListBefore(query, model, context);
     }
 
@@ -75,9 +75,6 @@ public class SkinBaseController extends BaseCRUDJsonBodyMappingController<SkinBa
     protected void init(Map<String, Object> model, Context context) {
 
         this.addDict(model, "imageResolution", paramService.getParamBySecondOrganize("SkinBase", "imageResolution"));
-
-
-
         super.init(model, context);
     }
 
@@ -85,9 +82,16 @@ public class SkinBaseController extends BaseCRUDJsonBodyMappingController<SkinBa
     @Override
     protected int viewAfter(Long id, Map<String, Object> model, SkinBaseEntity entity, Context context) throws AppException {
         List<SkinFieldEntity> skinFieldEntities = skinFieldService.find(new SkinFieldQuery().skinId(entity.getId()));
+        skinFieldEntities.forEach(skinFieldEntity -> updateUrl(skinFieldEntity));
         entity.setSkinFieldList(skinFieldEntities);
         return super.viewAfter(id, model, entity, context);
     }
 
+    private void updateUrl(SkinFieldEntity field) {
+        if ("2".equals(field.getFieldType())) {
+            field.setFieldValue(GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/") + field.getFieldValue());
+        }
+    }
+
 
 }
\ No newline at end of file

base-manager/src/main/resources/sqlmap/module/matter/MatterMapperExt.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.matter.dao.ibatis.MatterDaoImpl">
+
+
+    <select id="getSubListCount" parameterType="paramDto" resultType="int">
+        SELECT
+        count( 1 )
+        FROM
+        mortals_sys_matter AS a
+        LEFT JOIN ( SELECT matterCode FROM mortals_sys_site_matter WHERE siteId = #{condition.siteId} ) AS b ON a.matterNo = b.matterCode
+        <trim suffixOverrides="where" suffix="">
+            where b.matterCode IS NULL
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+
+    <!-- 获取事项差集列表列表 -->
+    <select id="getSubList" parameterType="paramDto" resultMap="MatterEntity-Map">
+        select
+        <include refid="_columns"/>
+        FROM
+        mortals_sys_matter AS a
+        LEFT JOIN ( SELECT matterCode FROM mortals_sys_site_matter WHERE siteId = #{condition.siteId} ) AS b ON a.matterNo = b.matterCode
+        <trim suffixOverrides="where" suffix="">
+            where b.matterCode IS NULL
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+</mapper>
\ No newline at end of file

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

@@ -25,6 +25,17 @@ Content-Type: application/json
   "size": 10
 }
 
+###基础事项差集列表
+POST {{baseUrl}}/matter/sublist
+Content-Type: application/json
+
+{
+  "areaCode": "513426000000",
+  "siteId": 35,
+  "page": 1,
+  "size": 10
+}
+
 
 ###基础事项更新与保存
 POST {{baseUrl}}/matter/save

base-manager/src/test/java/com/mortals/httpclient/skin/SkinBaseController.http

@@ -36,7 +36,7 @@ client.global.set("SkinBase_id", JSON.parse(response.body).data.id);
 %}
 
 ###系统基础皮肤查看
-GET {{baseUrl}}/skin/base/info?id={{SkinBase_id}}
+GET {{baseUrl}}/skin/base/view?id=28
 Authorization: {{authToken}}
 Accept: application/json