添加公共庫

sample-form-manager/db/module.sql

@@ -163,8 +163,8 @@ CREATE TABLE mortals_xhx_matter_datum
 -- ----------------------------
 -- 事项材料公共库表
 -- ----------------------------
-DROP TABLE IF EXISTS `mortals_xhx_public_datum`;
-CREATE TABLE mortals_xhx_public_datum
+DROP TABLE IF EXISTS `mortals_xhx_pubdatum`;
+CREATE TABLE mortals_xhx_pubdatum
 (
     `id`              bigint(20) AUTO_INCREMENT COMMENT '主键，自增长',
     `matterId`        bigint(20) COMMENT '事项matter id',
@@ -187,3 +187,5 @@ CREATE TABLE mortals_xhx_public_datum
 
 
 
+
+

sample-form-manager/src/main/java/com/mortals/xhx/module/public/dao/PublicDatumDao.java → sample-form-manager/src/main/java/com/mortals/xhx/module/pubdatum/dao/PubdatumDao.java

-package com.mortals.xhx.module.public.dao;
+package com.mortals.xhx.module.pubdatum.dao;
 
 import com.mortals.framework.dao.ICRUDDao;
-import com.mortals.xhx.module.public.model.PublicDatumEntity;
+import com.mortals.xhx.module.pubdatum.model.PubdatumEntity;
 import java.util.List;
 /**
 * 事项材料公共库Dao
@@ -11,7 +11,7 @@ import java.util.List;
 * @date 2022-11-10
 */
 
-public interface  PublicDatumDao extends ICRUDDao<PublicDatumEntity,Long>{
+public interface  PubdatumDao extends ICRUDDao<PubdatumEntity,Long>{
 
 
 }

sample-form-manager/src/main/java/com/mortals/xhx/module/public/dao/ibatis/PublicDatumDaoImpl.java → sample-form-manager/src/main/java/com/mortals/xhx/module/pubdatum/dao/ibatis/PubdatumDaoImpl.java

-package com.mortals.xhx.module.public.dao.ibatis;
+package com.mortals.xhx.module.pubdatum.dao.ibatis;
 
 
 import org.springframework.stereotype.Repository;
-import com.mortals.xhx.module.public.dao.PublicDatumDao;
-import com.mortals.xhx.module.public.model.PublicDatumEntity;
+import com.mortals.xhx.module.pubdatum.dao.PubdatumDao;
+import com.mortals.xhx.module.pubdatum.model.PubdatumEntity;
 import java.util.Date;
 import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
 import java.util.List;
@@ -13,8 +13,8 @@ import java.util.List;
 * @author zxfei
 * @date 2022-11-10
 */
-@Repository("publicDatumDao")
-public class PublicDatumDaoImpl extends BaseCRUDDaoMybatis<PublicDatumEntity,Long> implements PublicDatumDao {
+@Repository("pubdatumDao")
+public class PubdatumDaoImpl extends BaseCRUDDaoMybatis<PubdatumEntity,Long> implements PubdatumDao {
 
 
 

sample-form-manager/src/main/java/com/mortals/xhx/module/public/model/PublicDatumEntity.java → sample-form-manager/src/main/java/com/mortals/xhx/module/pubdatum/model/PubdatumEntity.java

-package com.mortals.xhx.module.public.model;
+package com.mortals.xhx.module.pubdatum.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.public.model.vo.PublicDatumVo;
+import com.mortals.xhx.module.pubdatum.model.vo.PubdatumVo;
 /**
 * 事项材料公共库实体对象
 *
@@ -13,7 +13,7 @@ import com.mortals.xhx.module.public.model.vo.PublicDatumVo;
 * @date 2022-11-10
 */
 
-public class PublicDatumEntity extends PublicDatumVo {
+public class PubdatumEntity extends PubdatumVo {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -59,7 +59,7 @@ public class PublicDatumEntity extends PublicDatumVo {
 
 
 
-    public PublicDatumEntity(){}
+    public PubdatumEntity(){}
     /**
     * 获取 事项matter id
     * @return Long
@@ -211,8 +211,8 @@ public class PublicDatumEntity extends PublicDatumVo {
     @Override
     public boolean equals(Object obj) {
         if (obj == null) return false;
-        if (obj instanceof PublicDatumEntity) {
-            PublicDatumEntity tmp = (PublicDatumEntity) obj;
+        if (obj instanceof PubdatumEntity) {
+            PubdatumEntity tmp = (PubdatumEntity) obj;
             if (this.getId() == tmp.getId()) {
                  return true;
             }

sample-form-manager/src/main/java/com/mortals/xhx/module/public/model/vo/PublicDatumVo.java → sample-form-manager/src/main/java/com/mortals/xhx/module/pubdatum/model/vo/PubdatumVo.java

-package com.mortals.xhx.module.public.model.vo;
+package com.mortals.xhx.module.pubdatum.model.vo;
 import com.mortals.framework.model.BaseEntityLong;
-import com.mortals.xhx.module.public.model.PublicDatumEntity;
+import com.mortals.xhx.module.pubdatum.model.PubdatumEntity;
 import java.util.ArrayList;
 import java.util.List;
 /**
@@ -9,6 +9,6 @@ import java.util.List;
 * @author zxfei
 * @date 2022-11-10
 */
-public class PublicDatumVo extends BaseEntityLong {
+public class PubdatumVo extends BaseEntityLong {
 
 }
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/public/service/PublicDatumService.java → sample-form-manager/src/main/java/com/mortals/xhx/module/pubdatum/service/PubdatumService.java

-package com.mortals.xhx.module.public.service;
+package com.mortals.xhx.module.pubdatum.service;
 import com.mortals.framework.service.ICRUDService;
-import com.mortals.xhx.module.public.model.PublicDatumEntity;
+import com.mortals.xhx.module.pubdatum.model.PubdatumEntity;
 /**
-* PublicDatumService
+* PubdatumService
 *
 * 事项材料公共库 service接口
 *
 * @author zxfei
 * @date 2022-11-10
 */
-public interface PublicDatumService extends ICRUDService<PublicDatumEntity,Long>{
+public interface PubdatumService extends ICRUDService<PubdatumEntity,Long>{
 
 }
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/public/service/impl/PublicDatumServiceImpl.java → sample-form-manager/src/main/java/com/mortals/xhx/module/pubdatum/service/impl/PubdatumServiceImpl.java

-package com.mortals.xhx.module.public.service.impl;
+package com.mortals.xhx.module.pubdatum.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.public.dao.PublicDatumDao;
-import com.mortals.xhx.module.public.model.PublicDatumEntity;
-import com.mortals.xhx.module.public.service.PublicDatumService;
+import com.mortals.xhx.module.pubdatum.dao.PubdatumDao;
+import com.mortals.xhx.module.pubdatum.model.PubdatumEntity;
+import com.mortals.xhx.module.pubdatum.service.PubdatumService;
 /**
-* PublicDatumService
+* PubdatumService
 * 事项材料公共库 service实现
 *
 * @author zxfei
 * @date 2022-11-10
 */
-@Service("publicDatumService")
-public class PublicDatumServiceImpl extends AbstractCRUDServiceImpl<PublicDatumDao, PublicDatumEntity, Long> implements PublicDatumService {
+@Service("pubdatumService")
+public class PubdatumServiceImpl extends AbstractCRUDServiceImpl<PubdatumDao, PubdatumEntity, Long> implements PubdatumService {
     
 }
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/public/web/PublicDatumController.java → sample-form-manager/src/main/java/com/mortals/xhx/module/pubdatum/web/PubdatumController.java

-package com.mortals.xhx.module.public.web;
+package com.mortals.xhx.module.pubdatum.web;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,8 +9,8 @@ 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.public.model.PublicDatumEntity;
-import com.mortals.xhx.module.public.service.PublicDatumService;
+import com.mortals.xhx.module.pubdatum.model.PubdatumEntity;
+import com.mortals.xhx.module.pubdatum.service.PubdatumService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
 import java.util.HashMap;
@@ -30,13 +30,13 @@ import static com.mortals.framework.ap.SysConstains.*;
 * @date 2022-11-10
 */
 @RestController
-@RequestMapping("public/datum")
-public class PublicDatumController extends BaseCRUDJsonBodyMappingController<PublicDatumService,PublicDatumEntity,Long> {
+@RequestMapping("pubdatum")
+public class PubdatumController extends BaseCRUDJsonBodyMappingController<PubdatumService,PubdatumEntity,Long> {
 
     @Autowired
     private ParamService paramService;
 
-    public PublicDatumController(){
+    public PubdatumController(){
         super.setModuleDesc( "事项材料公共库");
     }
 

sample-form-manager/src/main/resources/sqlmap/module/public/PublicDatumMapper.xml → sample-form-manager/src/main/resources/sqlmap/module/pubdatum/PubdatumMapper.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.public.dao.ibatis.PublicDatumDaoImpl">
+<mapper namespace="com.mortals.xhx.module.pubdatum.dao.ibatis.PubdatumDaoImpl">
 
     <!-- 字段和属性映射 -->
-    <resultMap type="PublicDatumEntity" id="PublicDatumEntity-Map">
+    <resultMap type="PubdatumEntity" id="PubdatumEntity-Map">
             <id  property="id" column="id" />
             <result property="matterId" column="matterId" />
             <result property="deptId" column="deptId" />
@@ -71,8 +71,8 @@
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
-    <insert id="insert" parameterType="PublicDatumEntity"  useGeneratedKeys="true" keyProperty="id">
-        insert into mortals_xhx_public_datum
+    <insert id="insert" parameterType="PubdatumEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_pubdatum
         (matterId,deptId,deptCode,materialName,materiaFullName,total,sort,sampleName,samplePath,preViewPath,createTime,createUserId,updateTime)
         VALUES
         (#{matterId},#{deptId},#{deptCode},#{materialName},#{materiaFullName},#{total},#{sort},#{sampleName},#{samplePath},#{preViewPath},#{createTime},#{createUserId},#{updateTime})
@@ -80,7 +80,7 @@
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
-        insert into mortals_xhx_public_datum
+        insert into mortals_xhx_pubdatum
         (matterId,deptId,deptCode,materialName,materiaFullName,total,sort,sampleName,samplePath,preViewPath,createTime,createUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
@@ -91,7 +91,7 @@
 
     <!-- 根据ParamDto更新 -->
     <update id="update" parameterType="paramDto">
-        update mortals_xhx_public_datum as a
+        update mortals_xhx_pubdatum as a
         set
         <trim suffixOverrides="," suffix="">
             <if test="(colPickMode==0 and data.containsKey('matterId')) or (colPickMode==1 and !data.containsKey('matterId'))">
@@ -158,7 +158,7 @@
     </update>
     <!-- 批量更新 -->
     <update id="updateBatch" parameterType="paramDto">
-        update mortals_xhx_public_datum as a
+        update mortals_xhx_pubdatum as a
         <trim prefix="set" suffixOverrides=",">
                         <trim prefix="matterId=(case" suffix="ELSE matterId end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
@@ -283,25 +283,25 @@
         </foreach>
     </update>
     <!-- 根据主健查询 -->
-    <select id="getByKey" parameterType="paramDto" resultMap="PublicDatumEntity-Map">
+    <select id="getByKey" parameterType="paramDto" resultMap="PubdatumEntity-Map">
         select <include refid="_columns"/>
-        from mortals_xhx_public_datum as a
+        from mortals_xhx_pubdatum as a
         where a.id=#{condition.id}
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_xhx_public_datum as a where a.id=#{condition.id}
+        delete a.* from mortals_xhx_pubdatum as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
-        delete from mortals_xhx_public_datum where id in
+        delete from mortals_xhx_pubdatum where id in
         <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
             #{item}
         </foreach>
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_xhx_public_datum as a
+        delete a.* from mortals_xhx_pubdatum as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">
@@ -310,9 +310,9 @@
         </trim>
     </delete>
     <!-- 获取列表 -->
-    <select id="getList" parameterType="paramDto" resultMap="PublicDatumEntity-Map">
+    <select id="getList" parameterType="paramDto" resultMap="PubdatumEntity-Map">
         select <include refid="_columns"/>
-        from mortals_xhx_public_datum as a
+        from mortals_xhx_pubdatum as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">
@@ -327,7 +327,7 @@
     <!-- 获取 -->
     <select id="getListCount" parameterType="paramDto" resultType="int">
         select count(1)
-        from mortals_xhx_public_datum as a
+        from mortals_xhx_pubdatum as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">