添加事项渠道

base-manager/db/add.sql

@@ -296,3 +296,27 @@ ALTER TABLE mortals_sys_window ADD COLUMN `filePath` varchar (256)  default "" C
 ALTER TABLE mortals_sys_matter ADD COLUMN `areaName` varchar(255)      COMMENT '区域名称';
 ALTER TABLE mortals_sys_matter ADD COLUMN `areaLevel` tinyint(2)      COMMENT '区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)';
 
+
+
+
+-- ----------------------------
+-- 办理渠道
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_sys_matter_channel`;
+CREATE TABLE `mortals_sys_matter_channel`  (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键，自增长',
+  `matterId` bigint(20) NOT NULL DEFAULT 0 COMMENT '基础事项表id',
+  `matterCode` varchar(512) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '',
+  `matterName` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '事项名称',
+  `name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '名称',
+  `description` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '描述信息',
+  `icon` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '图标',
+  `url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '跳转地址',
+  `source` tinyint(2) NULL DEFAULT 0 COMMENT '事项来源 (0.政务网，1.自定义)',
+  `remark`  varchar(512) CHARACTER SET utf8 COLLATE utf8_general_ci 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,
+  INDEX `idx_matterId`(`matterId`) 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/dao/MatterChannelDao.java

+package com.mortals.xhx.module.matter.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.matter.model.MatterChannelEntity;
+import java.util.List;
+/**
+* 办理渠道Dao
+* 办理渠道 DAO接口
+*
+* @author zxfei
+* @date 2025-03-18
+*/
+
+public interface  MatterChannelDao extends ICRUDDao<MatterChannelEntity,Long>{
+
+
+}

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

+package com.mortals.xhx.module.matter.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.matter.dao.MatterChannelDao;
+import com.mortals.xhx.module.matter.model.MatterChannelEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 办理渠道DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2025-03-18
+*/
+@Repository("matterChannelDao")
+public class MatterChannelDaoImpl extends BaseCRUDDaoMybatis<MatterChannelEntity,Long> implements MatterChannelDao {
+
+
+
+}

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

+package com.mortals.xhx.module.matter.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.matter.model.vo.MatterChannelVo;
+import lombok.Data;
+/**
+* 办理渠道实体对象
+*
+* @author zxfei
+* @date 2025-03-18
+*/
+@Data
+public class MatterChannelEntity extends MatterChannelVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 基础事项表id
+    */
+    private Long matterId;
+    /**
+    * 
+    */
+    private String matterCode;
+    /**
+    * 事项名称
+    */
+    private String matterName;
+    /**
+    * 名称
+    */
+    private String name;
+    /**
+    * 图标
+    */
+    private String icon;
+    /**
+    * 跳转地址
+    */
+    private String url;
+    /**
+    * 事项来源 (0.政务网，1.自定义)
+    */
+    private Integer source;
+    /**
+    * 备注
+    */
+    private String remark;
+    /**
+    * 描述信息
+    */
+    private String description;
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof MatterChannelEntity) {
+            MatterChannelEntity tmp = (MatterChannelEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+            this.matterId = 0L;
+            this.matterCode = "";
+            this.matterName = "";
+            this.name = "";
+            this.icon = "";
+            this.url = "";
+            this.source = 0;
+            this.remark = "";
+            this.description = "";
+    }
+}
\ No newline at end of file

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

+package com.mortals.xhx.module.matter.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.matter.model.MatterChannelEntity;
+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-18
+*/
+@Data
+public class MatterChannelVo extends BaseEntityLong {
+
+    /** 主键，自增长列表 */
+    private List <Long> idList;
+
+
+}
\ No newline at end of file

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

+package com.mortals.xhx.module.matter.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matter.model.MatterChannelEntity;
+import com.mortals.xhx.module.matter.dao.MatterChannelDao;
+/**
+* MatterChannelService
+*
+* 办理渠道 service接口
+*
+* @author zxfei
+* @date 2025-03-18
+*/
+public interface MatterChannelService extends ICRUDService<MatterChannelEntity,Long>{
+
+    MatterChannelDao getDao();
+}
\ No newline at end of file

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

+package com.mortals.xhx.module.matter.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.matter.dao.MatterChannelDao;
+import com.mortals.xhx.module.matter.model.MatterChannelEntity;
+import com.mortals.xhx.module.matter.service.MatterChannelService;
+import lombok.extern.slf4j.Slf4j;
+/**
+* MatterChannelService
+* 办理渠道 service实现
+*
+* @author zxfei
+* @date 2025-03-18
+*/
+@Service("matterChannelService")
+@Slf4j
+public class MatterChannelServiceImpl extends AbstractCRUDServiceImpl<MatterChannelDao, MatterChannelEntity, Long> implements MatterChannelService {
+    
+}
\ No newline at end of file

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

@@ -824,10 +824,6 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
                         matterFlowlimitEntity.setFlowDesc(m.getValue().toString());
                         bool = true;
                     }
-//                    if(!bool){
-//                        System.out.println("name:" + m.getKey());
-//                        System.out.print(" value:" + m.getValue());
-//                    }
                 }).count();
             }
             flowlimitEntityArrayList.add(matterFlowlimitEntity);

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

+package com.mortals.xhx.module.matter.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.matter.model.MatterChannelEntity;
+import com.mortals.xhx.module.matter.service.MatterChannelService;
+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-18
+*/
+@RestController
+@RequestMapping("matter/channel")
+public class MatterChannelController extends BaseCRUDJsonBodyMappingController<MatterChannelService,MatterChannelEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public MatterChannelController(){
+        super.setModuleDesc( "办理渠道");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+                this.addDict(model, "source", SourceEnum.getEnumMap());
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

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

@@ -4,7 +4,6 @@ POST {{baseUrl}}/area/list
 Content-Type: application/json
 
 {
-    "pid":0,
     "page":1,
     "size":5
 }