添加事项备注字段

base-manager/db/add.sql

@@ -329,3 +329,29 @@ CREATE TABLE `mortals_sys_matter_channel`  (
 -- 2025-3-19
 -- ----------------------------
 ALTER TABLE mortals_sys_matter ADD COLUMN `remark` varchar(512)      COMMENT '备注信息';
+
+
+
+
+-- ----------------------------
+-- 社保配置表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_sys_social_security_set`;
+CREATE TABLE `mortals_sys_social_security_set`  (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '序号，主键，自增长',
+    `siteId` bigint(20) NULL DEFAULT NULL COMMENT '站点id',
+    `siteName` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点名称',
+    `appid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '接入标识',
+    `access_key` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '渠道标识-应用标识',
+    `privat_key`  varchar(2048) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '私钥',
+    `key` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '渠道密钥',
+    `az400` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '机具编码',
+    `sm4key` varchar(2048) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '私钥',
+    `serviceCode` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '政务排号认证',
+    `enabled` tinyint(1) NULL DEFAULT 1 COMMENT '启用开关',
+    `remark` varchar(512) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '短信签名',
+    `createTime` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '创建时间',
+    `createUserId` bigint(20) NULL DEFAULT NULL COMMENT '创建用户',
+    `updateTime` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '社保配置表';
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterVo.java

@@ -26,14 +26,37 @@ public class MatterVo extends BaseEntityLong {
 
     private String genFilePath;
 
-
+    /**
+     * 项受理条件
+     */
     private List<MatterAcceptEntity> matterAcceptList;
+    /**
+     * 事项申请材料
+     */
     private List<MatterDatumEntity> matterDatumList;
+    /**
+     * 办理渠道
+     */
     private List<MatterChannelEntity> matterChannelList;
+    /**
+     * 事项收费标准
+     */
     private List<MatterChargesEntity> matterChargesList;
+    /**
+     * 事项办理流程
+     */
     private List<MatterFlowlimitEntity> matterFlowlimitList;
+    /**
+     * 事项中介服务
+     */
     private List<MatterIntermediaryEntity> matterIntermediaryList;
+    /**
+     * 事项常见问题
+     */
     private List<MatterQuestionEntity> matterQuestionList;
+    /**
+     * 事项设定依据
+     */
     private List<MatterSetbaseEntity> matterSetbaseList;
 
 

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

@@ -87,4 +87,6 @@ public interface MatterService extends ICRUDService<MatterEntity, Long> {
 
     Rest<Void> genMatterMarkdown(MatterQuery matterQuery,Context context);
 
+    Rest<Void> genMatterCSV(MatterQuery matterQuery,Context context);
+
 }
\ No newline at end of file

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

@@ -315,4 +315,26 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
         return ret;
     }
 
+
+    @PostMapping(value = "genMatterCsv")
+    @UnAuth
+    public Rest<Object> genMatterCsv(@RequestBody MatterQuery query) {
+        Rest<Object> ret = new Rest<>();
+        Map<String, Object> model = new HashMap<>();
+        String busiDesc = "生成文本" + this.getModuleDesc();
+        int code = VALUE_RESULT_SUCCESS;
+        try {
+            this.service.genMatterCSV(query, getContext());
+            model.put(MESSAGE_INFO, busiDesc + "成功");
+
+        } catch (Exception e) {
+            code = VALUE_RESULT_FAILURE;
+            this.doException(request, busiDesc, model, e);
+        }
+        ret.setCode(code);
+        ret.setData(model);
+        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/social/dao/SocialSecuritySetDao.java

+package com.mortals.xhx.module.social.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.social.model.SocialSecuritySetEntity;
+import java.util.List;
+/**
+* 社保配置Dao
+* 社保配置 DAO接口
+*
+* @author zxfei
+* @date 2025-03-21
+*/
+
+public interface  SocialSecuritySetDao extends ICRUDDao<SocialSecuritySetEntity,Long>{
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/social/dao/ibatis/SocialSecuritySetDaoImpl.java

+package com.mortals.xhx.module.social.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.social.dao.SocialSecuritySetDao;
+import com.mortals.xhx.module.social.model.SocialSecuritySetEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 社保配置DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2025-03-21
+*/
+@Repository("socialSecuritySetDao")
+public class SocialSecuritySetDaoImpl extends BaseCRUDDaoMybatis<SocialSecuritySetEntity,Long> implements SocialSecuritySetDao {
+
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/social/model/SocialSecuritySetEntity.java

+package com.mortals.xhx.module.social.model;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.social.model.vo.SocialSecuritySetVo;
+import lombok.Data;
+/**
+* 社保配置实体对象
+*
+* @author zxfei
+* @date 2025-03-21
+*/
+@Data
+public class SocialSecuritySetEntity extends SocialSecuritySetVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 站点id
+    */
+    private Long siteId;
+    /**
+    * 站点名称
+    */
+    private String siteName;
+    /**
+    * 接入标识
+    */
+    private String appid;
+    /**
+    * 渠道标识-应用标识
+    */
+    private String accessKey;
+    /**
+    * 私钥
+    */
+    private String privatKey;
+    /**
+    * 渠道密钥
+    */
+    private String key;
+    /**
+    * 机具编码
+    */
+    private String az400;
+    /**
+    * 私钥
+    */
+    private String sm4key;
+    /**
+    * 政务排号认证
+    */
+    private String serviceCode;
+    /**
+    * 启用开关
+    */
+    private Integer enabled;
+    /**
+    * 短信签名
+    */
+    private String remark;
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof SocialSecuritySetEntity) {
+            SocialSecuritySetEntity tmp = (SocialSecuritySetEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+            this.siteId = null;
+            this.siteName = "";
+            this.appid = "";
+            this.accessKey = "";
+            this.privatKey = "";
+            this.key = "";
+            this.az400 = "";
+            this.sm4key = "";
+            this.serviceCode = "";
+            this.enabled = 1;
+            this.remark = "";
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/social/model/vo/SocialSecuritySetVo.java

+package com.mortals.xhx.module.social.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.social.model.SocialSecuritySetEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+* 社保配置视图对象
+*
+* @author zxfei
+* @date 2025-03-21
+*/
+@Data
+public class SocialSecuritySetVo extends BaseEntityLong {
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/social/service/SocialSecuritySetService.java

+package com.mortals.xhx.module.social.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.social.model.SocialSecuritySetEntity;
+import com.mortals.xhx.module.social.dao.SocialSecuritySetDao;
+/**
+* SocialSecuritySetService
+*
+* 社保配置 service接口
+*
+* @author zxfei
+* @date 2025-03-21
+*/
+public interface SocialSecuritySetService extends ICRUDService<SocialSecuritySetEntity,Long>{
+
+    SocialSecuritySetDao getDao();
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/social/service/impl/SocialSecuritySetServiceImpl.java

+package com.mortals.xhx.module.social.service.impl;
+import com.mortals.framework.model.PageInfo;
+import org.springframework.beans.BeanUtils;
+import java.util.function.Function;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.social.dao.SocialSecuritySetDao;
+import com.mortals.xhx.module.social.model.SocialSecuritySetEntity;
+import com.mortals.xhx.module.social.service.SocialSecuritySetService;
+import lombok.extern.slf4j.Slf4j;
+/**
+* SocialSecuritySetService
+* 社保配置 service实现
+*
+* @author zxfei
+* @date 2025-03-21
+*/
+@Service("socialSecuritySetService")
+@Slf4j
+public class SocialSecuritySetServiceImpl extends AbstractCRUDServiceImpl<SocialSecuritySetDao, SocialSecuritySetEntity, Long> implements SocialSecuritySetService {
+    
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/social/web/SocialSecuritySetController.java

+package com.mortals.xhx.module.social.web;
+
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.social.model.SocialSecuritySetEntity;
+import com.mortals.xhx.module.social.service.SocialSecuritySetService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.Arrays;
+
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import static com.mortals.framework.ap.SysConstains.*;
+
+import com.mortals.xhx.common.code.*;
+
+/**
+ * 社保配置
+ *
+ * @author zxfei
+ * @date 2025-03-21
+ */
+@RestController
+@RequestMapping("social/security/set")
+public class SocialSecuritySetController extends BaseCRUDJsonBodyMappingController<SocialSecuritySetService, SocialSecuritySetEntity, Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public SocialSecuritySetController() {
+        super.setModuleDesc("社保配置");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

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

@@ -32,6 +32,13 @@ Content-Type: application/json
 {"areaCode": "511124000000"}
 
 
+###生成csv
+POST {{baseUrl}}/matter/genMatterCsv
+Content-Type: application/json
+
+{"areaCode": "510903000000", "genFilePath": "E:/home/csv/"}
+
+
 ###生成文本1
 POST {{baseUrl}}/matter/genMatterMarkdown
 Content-Type: application/json
@@ -78,73 +85,12 @@ Content-Type: application/json
 
 ###基础事项更新与保存
 POST {{baseUrl}}/matter/save
+Authorization: {{authToken}}
 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
+  "id": 1581,
+  "remark": "8v8deo"
 }
 
 > {%

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

@@ -4,12 +4,12 @@ Accept: application/json
 ###
 
 ###登录
-POST {{baseUrl}}/login/login
+POST http://192.168.0.250:11072/zwfw/login/login
 Content-Type: application/json
 
 {
   "loginName":"admin",
-  "password":"admin",
+  "password":"xhxADMIN8@a",
   "securityCode":"admin"
 }