Merge branch 'master' of http://gitlab.scsmile.cn/zxf/sample-form-platform

sample-form-manager/db/add.sql

@@ -19,4 +19,40 @@ ALTER TABLE mortals_xhx_device
 ALTER TABLE mortals_xhx_device
     ADD COLUMN `onlineTime` datetime DEFAULT NULL COMMENT '最近上线时间' AFTER deviceRemark;
 ALTER TABLE mortals_xhx_device
-    ADD COLUMN `offlineTime` datetime DEFAULT NULL COMMENT '最近离线时间' AFTER onlineTime;
\ No newline at end of file
+    ADD COLUMN `offlineTime` datetime DEFAULT NULL COMMENT '最近离线时间' AFTER onlineTime;
+
+
+-- ----------------------------
+-- 材料分类表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_datum_category`;
+CREATE TABLE mortals_xhx_datum_category(
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '主键ID，主键，自增长',
+    `categoryId` bigint(20)      COMMENT '分类id',
+    `categoryName` varchar(256)      COMMENT '分类名称',
+    `materialId` bigint(20)      COMMENT '材料Id',
+    `materialName` varchar(256)      COMMENT '材料名称',
+    `sort` int(4)    DEFAULT '0'  COMMENT '排序字段',
+    `createTime` datetime      COMMENT '创建时间',
+    `createUserId` bigint(20)      COMMENT '创建用户',
+    `updateUserId` bigint(20)      COMMENT '更新用户',
+    `updateTime` datetime      COMMENT '更新时间',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='材料分类';
+-- ----------------------------
+-- 事项材料分类表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_matter_category`;
+CREATE TABLE mortals_xhx_matter_category(
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '主键ID，主键，自增长',
+    `categoryCode` varchar(20)      COMMENT '分类编码',
+    `categoryName` varchar(256)      COMMENT '分类名称',
+    `matterId` bigint(20)      COMMENT '事项Id',
+    `matterName` varchar(256)      COMMENT '事项名称',
+    `sort` int(4)    DEFAULT '0'  COMMENT '排序字段',
+    `createTime` datetime      COMMENT '创建时间',
+    `createUserId` bigint(20)      COMMENT '创建用户',
+    `updateUserId` bigint(20)      COMMENT '更新用户',
+    `updateTime` datetime      COMMENT '更新时间',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项材料分类';

sample-form-manager/src/main/java/com/mortals/xhx/module/datum/dao/DatumCategoryDao.java

+package com.mortals.xhx.module.datum.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.datum.model.DatumCategoryEntity;
+import java.util.List;
+/**
+* 材料分类Dao
+* 材料分类 DAO接口
+*
+* @author zxfei
+* @date 2023-06-21
+*/
+
+public interface  DatumCategoryDao extends ICRUDDao<DatumCategoryEntity,Long>{
+
+
+}

sample-form-manager/src/main/java/com/mortals/xhx/module/datum/dao/ibatis/DatumCategoryDaoImpl.java

+package com.mortals.xhx.module.datum.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.datum.dao.DatumCategoryDao;
+import com.mortals.xhx.module.datum.model.DatumCategoryEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 材料分类DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-06-21
+*/
+@Repository("datumCategoryDao")
+public class DatumCategoryDaoImpl extends BaseCRUDDaoMybatis<DatumCategoryEntity,Long> implements DatumCategoryDao {
+
+
+
+}

sample-form-manager/src/main/java/com/mortals/xhx/module/datum/model/DatumCategoryEntity.java

+package com.mortals.xhx.module.datum.model;
+import java.util.List;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.datum.model.vo.DatumCategoryVo;
+import lombok.Data;
+/**
+* 材料分类实体对象
+*
+* @author zxfei
+* @date 2023-06-21
+*/
+@Data
+public class DatumCategoryEntity extends DatumCategoryVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 分类id
+    */
+    private Long categoryId;
+    /**
+    * 分类名称
+    */
+    private String categoryName;
+    /**
+    * 材料Id
+    */
+    private Long materialId;
+    /**
+    * 材料名称
+    */
+    private String materialName;
+    /**
+    * 排序字段
+    */
+    private Integer sort;
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof DatumCategoryEntity) {
+            DatumCategoryEntity tmp = (DatumCategoryEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+
+            this.categoryId = -1L;
+
+            this.categoryName = "";
+
+            this.materialId = -1L;
+
+            this.materialName = "";
+
+            this.sort = 0;
+    }
+}
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/datum/model/vo/DatumCategoryVo.java

+package com.mortals.xhx.module.datum.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.datum.model.DatumCategoryEntity;
+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 2023-06-21
+*/
+@Data
+public class DatumCategoryVo extends BaseEntityLong {
+
+}
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/datum/service/DatumCategoryService.java

+package com.mortals.xhx.module.datum.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.datum.model.DatumCategoryEntity;
+import com.mortals.xhx.module.datum.dao.DatumCategoryDao;
+/**
+* DatumCategoryService
+*
+* 材料分类 service接口
+*
+* @author zxfei
+* @date 2023-06-21
+*/
+public interface DatumCategoryService extends ICRUDService<DatumCategoryEntity,Long>{
+
+    DatumCategoryDao getDao();
+}
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/datum/service/impl/DatumCategoryServiceImpl.java

+package com.mortals.xhx.module.datum.service.impl;
+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.datum.dao.DatumCategoryDao;
+import com.mortals.xhx.module.datum.model.DatumCategoryEntity;
+import com.mortals.xhx.module.datum.service.DatumCategoryService;
+import lombok.extern.slf4j.Slf4j;
+/**
+* DatumCategoryService
+* 材料分类 service实现
+*
+* @author zxfei
+* @date 2023-06-21
+*/
+@Service("datumCategoryService")
+@Slf4j
+public class DatumCategoryServiceImpl extends AbstractCRUDServiceImpl<DatumCategoryDao, DatumCategoryEntity, Long> implements DatumCategoryService {
+    
+}
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/datum/web/DatumCategoryController.java

+package com.mortals.xhx.module.datum.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.datum.model.DatumCategoryEntity;
+import com.mortals.xhx.module.datum.service.DatumCategoryService;
+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.*;
+/**
+*
+* 材料分类
+*
+* @author zxfei
+* @date 2023-06-21
+*/
+@RestController
+@RequestMapping("datum/category")
+public class DatumCategoryController extends BaseCRUDJsonBodyMappingController<DatumCategoryService,DatumCategoryEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public DatumCategoryController(){
+        super.setModuleDesc( "材料分类");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/dao/MatterCategoryDao.java

+package com.mortals.xhx.module.matter.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.matter.model.MatterCategoryEntity;
+import java.util.List;
+/**
+* 事项材料分类Dao
+* 事项材料分类 DAO接口
+*
+* @author zxfei
+* @date 2023-06-21
+*/
+
+public interface  MatterCategoryDao extends ICRUDDao<MatterCategoryEntity,Long>{
+
+
+}

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/dao/ibatis/MatterCategoryDaoImpl.java

+package com.mortals.xhx.module.matter.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.matter.dao.MatterCategoryDao;
+import com.mortals.xhx.module.matter.model.MatterCategoryEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 事项材料分类DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-06-21
+*/
+@Repository("matterCategoryDao")
+public class MatterCategoryDaoImpl extends BaseCRUDDaoMybatis<MatterCategoryEntity,Long> implements MatterCategoryDao {
+
+
+
+}

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterCategoryEntity.java

+package com.mortals.xhx.module.matter.model;
+import java.util.List;
+import java.util.ArrayList;
+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.MatterCategoryVo;
+import lombok.Data;
+/**
+* 事项材料分类实体对象
+*
+* @author zxfei
+* @date 2023-06-21
+*/
+@Data
+public class MatterCategoryEntity extends MatterCategoryVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 分类编码
+    */
+    private String categoryCode;
+    /**
+    * 分类名称
+    */
+    private String categoryName;
+    /**
+    * 事项Id
+    */
+    private Long matterId;
+    /**
+    * 事项名称
+    */
+    private String matterName;
+    /**
+    * 排序字段
+    */
+    private Integer sort;
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof MatterCategoryEntity) {
+            MatterCategoryEntity tmp = (MatterCategoryEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+
+            this.categoryCode = "";
+
+            this.categoryName = "";
+
+            this.matterId = -1L;
+
+            this.matterName = "";
+
+            this.sort = 0;
+    }
+}
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterCategoryVo.java

+package com.mortals.xhx.module.matter.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.matter.model.MatterCategoryEntity;
+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 2023-06-21
+*/
+@Data
+public class MatterCategoryVo extends BaseEntityLong {
+
+}
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterCategoryService.java

+package com.mortals.xhx.module.matter.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matter.model.MatterCategoryEntity;
+import com.mortals.xhx.module.matter.dao.MatterCategoryDao;
+/**
+* MatterCategoryService
+*
+* 事项材料分类 service接口
+*
+* @author zxfei
+* @date 2023-06-21
+*/
+public interface MatterCategoryService extends ICRUDService<MatterCategoryEntity,Long>{
+
+    MatterCategoryDao getDao();
+}
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterCategoryServiceImpl.java

+package com.mortals.xhx.module.matter.service.impl;
+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.MatterCategoryDao;
+import com.mortals.xhx.module.matter.model.MatterCategoryEntity;
+import com.mortals.xhx.module.matter.service.MatterCategoryService;
+import lombok.extern.slf4j.Slf4j;
+/**
+* MatterCategoryService
+* 事项材料分类 service实现
+*
+* @author zxfei
+* @date 2023-06-21
+*/
+@Service("matterCategoryService")
+@Slf4j
+public class MatterCategoryServiceImpl extends AbstractCRUDServiceImpl<MatterCategoryDao, MatterCategoryEntity, Long> implements MatterCategoryService {
+    
+}
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterCategoryController.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.MatterCategoryEntity;
+import com.mortals.xhx.module.matter.service.MatterCategoryService;
+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.*;
+/**
+*
+* 事项材料分类
+*
+* @author zxfei
+* @date 2023-06-21
+*/
+@RestController
+@RequestMapping("matter/category")
+public class MatterCategoryController extends BaseCRUDJsonBodyMappingController<MatterCategoryService,MatterCategoryEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public MatterCategoryController(){
+        super.setModuleDesc( "事项材料分类");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

sample-form-manager/src/test/java/com/mortals/httpclient/matter/MatterCategoryController.http

+###登录
+POST {{baseUrl}}/login/login
+Content-Type: application/json
+
+{
+"loginName":"admin",
+"password":"admin",
+"securityCode":"8888"
+}
+
+> {%
+client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
+client.global.set("authToken", JSON.parse(response.body).data.token);
+%}
+
+###事项材料分类列表
+POST {{baseUrl}}/matter/category/list
+Content-Type: application/json
+
+{
+    "page":1,
+    "size":10
+}
+
+
+###事项材料分类更新与保存
+POST {{baseUrl}}/matter/category/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "categoryCode":"jqk7xn",
+        "categoryName":"tqwhx7",
+        "matterId":154,
+        "matterName":"xlabvi",
+        "sort":0,
+}
+
+> {%
+client.global.set("MatterCategory_id", JSON.parse(response.body).data.id);
+%}
+
+###事项材料分类查看
+GET {{baseUrl}}/matter/category/info?id={{MatterCategory_id}}
+Accept: application/json
+
+###事项材料分类编辑
+GET {{baseUrl}}/matter/category/edit?id={{MatterCategory_id}}
+Accept: application/json
+
+
+###事项材料分类删除
+GET {{baseUrl}}/matter/category/delete?id={{MatterCategory_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+