重构部分功能模块

fill-manager/src/main/java/com/mortals/xhx/module/hotword/dao/HotwordDao.java

+package com.mortals.xhx.module.hotword.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.hotword.model.HotwordEntity;
+
+/**
+* 热门词汇业务Dao
+* 热门词汇业务 DAO接口
+*
+* @author zxfei
+* @date 2022-11-17
+*/
+
+public interface  HotwordDao extends ICRUDDao<HotwordEntity,Long>{
+
+
+}

fill-manager/src/main/java/com/mortals/xhx/module/hotword/dao/ibatis/HotwordDaoImpl.java

+package com.mortals.xhx.module.hotword.dao.ibatis;
+
+
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import com.mortals.xhx.module.hotword.dao.HotwordDao;
+import com.mortals.xhx.module.hotword.model.HotwordEntity;
+import org.springframework.stereotype.Repository;
+
+/**
+* 热门词汇业务DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-11-17
+*/
+@Repository("hotwordDao")
+public class HotwordDaoImpl extends BaseCRUDDaoMybatis<HotwordEntity,Long> implements HotwordDao {
+
+
+
+}

fill-manager/src/main/java/com/mortals/xhx/module/hotword/model/HotwordEntity.java

+package com.mortals.xhx.module.hotword.model;
+
+import com.mortals.xhx.module.hotword.model.vo.HotwordVo;
+/**
+* 热门词汇业务实体对象
+*
+* @author zxfei
+* @date 2022-11-17
+*/
+
+public class HotwordEntity extends HotwordVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 站点ID
+    */
+    private Long siteId;
+    /**
+    * 热门词汇
+    */
+    private String hotwords;
+    /**
+    * 空白打印材料展示数量
+    */
+    private Integer printDisplay;
+
+
+
+    public HotwordEntity(){}
+    /**
+    * 获取 站点ID
+    * @return Long
+    */
+    public Long getSiteId(){
+        return siteId;
+    }
+    /**
+    * 设置 站点ID
+    * @param siteId
+    */
+    public void setSiteId(Long siteId){
+        this.siteId = siteId;
+    }
+    /**
+    * 获取 热门词汇
+    * @return String
+    */
+    public String getHotwords(){
+        return hotwords;
+    }
+    /**
+    * 设置 热门词汇
+    * @param hotwords
+    */
+    public void setHotwords(String hotwords){
+        this.hotwords = hotwords;
+    }
+    /**
+    * 获取 空白打印材料展示数量
+    * @return Integer
+    */
+    public Integer getPrintDisplay(){
+        return printDisplay;
+    }
+    /**
+    * 设置 空白打印材料展示数量
+    * @param printDisplay
+    */
+    public void setPrintDisplay(Integer printDisplay){
+        this.printDisplay = printDisplay;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof HotwordEntity) {
+            HotwordEntity tmp = (HotwordEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",siteId:").append(getSiteId());
+        sb.append(",hotwords:").append(getHotwords());
+        sb.append(",printDisplay:").append(getPrintDisplay());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.siteId = null;
+
+            this.hotwords = "";
+
+            this.printDisplay = 0;
+    }
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/hotword/model/HotwordQuery.java

+package com.mortals.xhx.module.hotword.model;
+
+import java.util.List;
+
+/**
+* 热门词汇业务查询对象
+*
+* @author zxfei
+* @date 2022-11-17
+*/
+public class HotwordQuery extends HotwordEntity {
+    /** 开始 主键，自增长 */
+    private Long idStart;
+
+    /** 结束 主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 主键，自增长 */
+    private Long idIncrement;
+
+    /** 主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 开始 站点ID */
+    private Long siteIdStart;
+
+    /** 结束 站点ID */
+    private Long siteIdEnd;
+
+    /** 增加 站点ID */
+    private Long siteIdIncrement;
+
+    /** 站点ID列表 */
+    private List <Long> siteIdList;
+
+    /** 热门词汇 */
+    private List<String> hotwordsList;
+
+    /** 开始 空白打印材料展示数量 */
+    private Integer printDisplayStart;
+
+    /** 结束 空白打印材料展示数量 */
+    private Integer printDisplayEnd;
+
+    /** 增加 空白打印材料展示数量 */
+    private Integer printDisplayIncrement;
+
+    /** 空白打印材料展示数量列表 */
+    private List <Integer> printDisplayList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 开始 修改时间 */
+    private String updateTimeStart;
+
+    /** 结束 修改时间 */
+    private String updateTimeEnd;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<HotwordQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<HotwordQuery> andConditionList;
+
+    public HotwordQuery(){}
+
+    /**
+    * 获取 开始 主键，自增长
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 主键，自增长
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 主键，自增长
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 主键，自增长
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 主键，自增长
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 主键，自增长
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 主键，自增长
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 主键，自增长
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 开始 站点ID
+    * @return siteIdStart
+    */
+    public Long getSiteIdStart(){
+        return this.siteIdStart;
+    }
+
+    /**
+    * 设置 开始 站点ID
+    * @param siteIdStart
+    */
+    public void setSiteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+    }
+
+    /**
+    * 获取 结束 站点ID
+    * @return $siteIdEnd
+    */
+    public Long getSiteIdEnd(){
+        return this.siteIdEnd;
+    }
+
+    /**
+    * 设置 结束 站点ID
+    * @param siteIdEnd
+    */
+    public void setSiteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+    }
+
+    /**
+    * 获取 增加 站点ID
+    * @return siteIdIncrement
+    */
+    public Long getSiteIdIncrement(){
+        return this.siteIdIncrement;
+    }
+
+    /**
+    * 设置 增加 站点ID
+    * @param siteIdIncrement
+    */
+    public void setSiteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+    }
+
+    /**
+    * 获取 站点ID
+    * @return siteIdList
+    */
+    public List<Long> getSiteIdList(){
+        return this.siteIdList;
+    }
+
+    /**
+    * 设置 站点ID
+    * @param siteIdList
+    */
+    public void setSiteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+    }
+
+    /**
+    * 获取 热门词汇
+    * @return hotwordsList
+    */
+    public List<String> getHotwordsList(){
+        return this.hotwordsList;
+    }
+
+    /**
+    * 设置 热门词汇
+    * @param hotwordsList
+    */
+    public void setHotwordsList(List<String> hotwordsList){
+        this.hotwordsList = hotwordsList;
+    }
+    /**
+    * 获取 开始 空白打印材料展示数量
+    * @return printDisplayStart
+    */
+    public Integer getPrintDisplayStart(){
+        return this.printDisplayStart;
+    }
+
+    /**
+    * 设置 开始 空白打印材料展示数量
+    * @param printDisplayStart
+    */
+    public void setPrintDisplayStart(Integer printDisplayStart){
+        this.printDisplayStart = printDisplayStart;
+    }
+
+    /**
+    * 获取 结束 空白打印材料展示数量
+    * @return $printDisplayEnd
+    */
+    public Integer getPrintDisplayEnd(){
+        return this.printDisplayEnd;
+    }
+
+    /**
+    * 设置 结束 空白打印材料展示数量
+    * @param printDisplayEnd
+    */
+    public void setPrintDisplayEnd(Integer printDisplayEnd){
+        this.printDisplayEnd = printDisplayEnd;
+    }
+
+    /**
+    * 获取 增加 空白打印材料展示数量
+    * @return printDisplayIncrement
+    */
+    public Integer getPrintDisplayIncrement(){
+        return this.printDisplayIncrement;
+    }
+
+    /**
+    * 设置 增加 空白打印材料展示数量
+    * @param printDisplayIncrement
+    */
+    public void setPrintDisplayIncrement(Integer printDisplayIncrement){
+        this.printDisplayIncrement = printDisplayIncrement;
+    }
+
+    /**
+    * 获取 空白打印材料展示数量
+    * @return printDisplayList
+    */
+    public List<Integer> getPrintDisplayList(){
+        return this.printDisplayList;
+    }
+
+    /**
+    * 设置 空白打印材料展示数量
+    * @param printDisplayList
+    */
+    public void setPrintDisplayList(List<Integer> printDisplayList){
+        this.printDisplayList = printDisplayList;
+    }
+
+    /**
+    * 获取 开始 创建时间
+    * @return createTimeStart
+    */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+    * 设置 开始 创建时间
+    * @param createTimeStart
+    */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+    * 获取 结束 创建时间
+    * @return createTimeEnd
+    */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+    * 设置 结束 创建时间
+    * @param createTimeEnd
+    */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+    * 获取 开始 创建用户
+    * @return createUserIdStart
+    */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+    * 获取 结束 创建用户
+    * @return $createUserIdEnd
+    */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 创建用户
+    * @return createUserIdIncrement
+    */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdList
+    */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+    * 获取 开始 修改时间
+    * @return updateTimeStart
+    */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+    * 设置 开始 修改时间
+    * @param updateTimeStart
+    */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+    * 获取 结束 修改时间
+    * @return updateTimeEnd
+    */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+    * 设置 结束 修改时间
+    * @param updateTimeEnd
+    */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+    * 设置  主键，自增长
+    * @param id
+    */
+    public HotwordQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 主键，自增长
+    * @param idStart
+    */
+    public HotwordQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 主键，自增长
+    * @param idEnd
+    */
+    public HotwordQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 主键，自增长
+    * @param idIncrement
+    */
+    public HotwordQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 主键，自增长
+    * @param idList
+    */
+    public HotwordQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+    /**
+    * 设置  站点ID
+    * @param siteId
+    */
+    public HotwordQuery siteId(Long siteId){
+	    setSiteId(siteId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 站点ID
+    * @param siteIdStart
+    */
+    public HotwordQuery siteIdStart(Long siteIdStart){
+		this.siteIdStart = siteIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 站点ID
+    * @param siteIdEnd
+    */
+    public HotwordQuery siteIdEnd(Long siteIdEnd){
+		this.siteIdEnd = siteIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 站点ID
+    * @param siteIdIncrement
+    */
+    public HotwordQuery siteIdIncrement(Long siteIdIncrement){
+		this.siteIdIncrement = siteIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 站点ID
+    * @param siteIdList
+    */
+    public HotwordQuery siteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+		return this;
+        }
+
+
+	/**
+    * 设置 热门词汇
+    * @param hotwords
+    */
+    public HotwordQuery hotwords(String hotwords){
+        setHotwords(hotwords);
+		return this;
+    }
+
+    /**
+    * 设置 热门词汇
+    * @param hotwordsList
+    */
+    public HotwordQuery hotwordsList(List<String> hotwordsList){
+        this.hotwordsList = hotwordsList;
+		return this;
+    }
+
+    /**
+    * 设置  空白打印材料展示数量
+    * @param printDisplay
+    */
+    public HotwordQuery printDisplay(Integer printDisplay){
+	    setPrintDisplay(printDisplay);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 空白打印材料展示数量
+    * @param printDisplayStart
+    */
+    public HotwordQuery printDisplayStart(Integer printDisplayStart){
+		this.printDisplayStart = printDisplayStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 空白打印材料展示数量
+    * @param printDisplayEnd
+    */
+    public HotwordQuery printDisplayEnd(Integer printDisplayEnd){
+		this.printDisplayEnd = printDisplayEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 空白打印材料展示数量
+    * @param printDisplayIncrement
+    */
+    public HotwordQuery printDisplayIncrement(Integer printDisplayIncrement){
+		this.printDisplayIncrement = printDisplayIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 空白打印材料展示数量
+    * @param printDisplayList
+    */
+    public HotwordQuery printDisplayList(List<Integer> printDisplayList){
+        this.printDisplayList = printDisplayList;
+		return this;
+        }
+
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public HotwordQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public HotwordQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public HotwordQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public HotwordQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public HotwordQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<HotwordQuery> getOrConditionList(){
+    return this.orConditionList;
+    }
+
+    /**
+    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @param orConditionList
+    */
+    public void setOrConditionList(List<HotwordQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @return andConditionList
+    */
+    public List<HotwordQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @param andConditionList
+    */
+    public void setAndConditionList(List<HotwordQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/hotword/model/vo/HotwordVo.java

+package com.mortals.xhx.module.hotword.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+
+/**
+* 热门词汇业务视图对象
+*
+* @author zxfei
+* @date 2022-11-17
+*/
+public class HotwordVo extends BaseEntityLong {
+
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/hotword/service/HotwordService.java

+package com.mortals.xhx.module.hotword.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.hotword.model.HotwordEntity;
+/**
+* HotwordService
+*
+* 热门词汇业务 service接口
+*
+* @author zxfei
+* @date 2022-11-17
+*/
+public interface HotwordService extends ICRUDService<HotwordEntity,Long>{
+
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/hotword/service/impl/HotwordServiceImpl.java

+package com.mortals.xhx.module.hotword.service.impl;
+
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.hotword.dao.HotwordDao;
+import com.mortals.xhx.module.hotword.model.HotwordEntity;
+import com.mortals.xhx.module.hotword.service.HotwordService;
+import org.springframework.stereotype.Service;
+
+/**
+* HotwordService
+* 热门词汇业务 service实现
+*
+* @author zxfei
+* @date 2022-11-17
+*/
+@Service("hotwordService")
+public class HotwordServiceImpl extends AbstractCRUDServiceImpl<HotwordDao, HotwordEntity, Long> implements HotwordService {
+
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/hotword/web/HotwordController.java

+package com.mortals.xhx.module.hotword.web;
+
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.hotword.model.HotwordEntity;
+import com.mortals.xhx.module.hotword.model.HotwordQuery;
+import com.mortals.xhx.module.hotword.service.HotwordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+*
+* 热门词汇业务
+*
+* @author zxfei
+* @date 2022-11-17
+*/
+@RestController
+@RequestMapping("hotword")
+public class HotwordController extends BaseCRUDJsonBodyMappingController<HotwordService,HotwordEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public HotwordController(){
+        super.setModuleDesc( "热门词汇业务");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+    @Override
+    protected void saveBefore(HotwordEntity entity, Map<String, Object> model, Context context) throws AppException {
+        HotwordEntity hotwordEntity = this.service.selectOne(new HotwordQuery().siteId(entity.getSiteId()));
+        if(!ObjectUtils.isEmpty(hotwordEntity)){
+            entity.setId(hotwordEntity.getId());
+        }
+        super.saveBefore(entity, model, context);
+    }
+}
\ No newline at end of file