用户常用模块收藏功能

portal-manager/src/main/java/com/mortals/xhx/module/model/ModelController.java

@@ -5,9 +5,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
-import com.mortals.framework.model.Context;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.framework.web.BaseJsonBodyController;
+import com.mortals.xhx.common.code.ModelTypeEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.pdu.ModelPdu;
 import com.mortals.xhx.feign.model.IApiModelFeign;
@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -97,9 +98,9 @@ public class ModelController extends BaseJsonBodyController {
             List<ModelFeignVO> modelFeignVOList = JSONObject.parseArray(apiResp.getData().get("data").toString(),ModelFeignVO.class);
             List<ModelFeignVO> list = modelFeignVOList.stream().filter(item->map.containsKey(item.getId())).collect(Collectors.toList());
             if(this.getCurUser().getId()==1){
-                model.put("data", modelFeignVOList);
+                model.put("data", doGroup(modelFeignVOList));
             }else {
-                model.put("data", list);
+                model.put("data", doGroup(list));
             }
             model.put("message_info", busiDesc + "成功");
             this.recordSysLog(this.request, busiDesc + " 【成功】");
@@ -113,6 +114,21 @@ public class ModelController extends BaseJsonBodyController {
         return ret;
     }
 
+    private List<Map<String,List<ModelFeignVO>>> doGroup(List<ModelFeignVO> result){
+        Map<Integer,List<ModelFeignVO>> groupMap = result.stream().collect(Collectors.groupingBy(t -> t.getType()));
+        List<Map<String,List<ModelFeignVO>>> mapList = new ArrayList<>();
+        Map<String,List<ModelFeignVO>> jcMap = new HashMap<>();
+        jcMap.put(ModelTypeEnum.JC.getDesc(),groupMap.get(ModelTypeEnum.JC.getValue()));
+        mapList.add(jcMap);
+        Map<String,List<ModelFeignVO>> g2gMap = new HashMap<>();
+        g2gMap.put(ModelTypeEnum.G2G.getDesc(),groupMap.get(ModelTypeEnum.G2G.getValue()));
+        mapList.add(g2gMap);
+        Map<String,List<ModelFeignVO>> g2cMap = new HashMap<>();
+        g2cMap.put(ModelTypeEnum.G2C.getDesc(),groupMap.get(ModelTypeEnum.G2C.getValue()));
+        mapList.add(g2cMap);
+        return mapList;
+    }
+
     /**
      * 根据站点id查询数据管理列表
      * @param query

portal-manager/src/main/java/com/mortals/xhx/module/user/dao/UserModelCollectDao.java

+package com.mortals.xhx.module.user.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.user.model.UserModelCollectEntity;
+import java.util.List;
+/**
+* 用户模块收藏Dao
+* 用户模块收藏 DAO接口
+*
+* @author zxfei
+* @date 2023-08-29
+*/
+
+public interface  UserModelCollectDao extends ICRUDDao<UserModelCollectEntity,Long>{
+
+
+}

portal-manager/src/main/java/com/mortals/xhx/module/user/dao/ibatis/UserModelCollectDaoImpl.java

+package com.mortals.xhx.module.user.dao.ibatis;
+
+
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import com.mortals.xhx.module.user.dao.UserModelCollectDao;
+import com.mortals.xhx.module.user.model.UserModelCollectEntity;
+import org.springframework.stereotype.Repository;
+/**
+* 用户模块收藏DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-08-29
+*/
+@Repository("userModelCollectDao")
+public class UserModelCollectDaoImpl extends BaseCRUDDaoMybatis<UserModelCollectEntity,Long> implements UserModelCollectDao {
+
+
+
+}

portal-manager/src/main/java/com/mortals/xhx/module/user/model/UserModelCollectEntity.java

+package com.mortals.xhx.module.user.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.user.model.vo.UserModelCollectVo;
+import lombok.Data;
+/**
+* 用户模块收藏实体对象
+*
+* @author zxfei
+* @date 2023-08-29
+*/
+@Data
+public class UserModelCollectEntity extends UserModelCollectVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 用户ID，主键，自增长
+    */
+    private Long userId;
+    /**
+    * 登录名
+    */
+    private String realName;
+    /**
+    * 收藏模块
+    */
+    private String modelIds;
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof UserModelCollectEntity) {
+            UserModelCollectEntity tmp = (UserModelCollectEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+
+            this.userId = -1L;
+
+            this.realName = "";
+
+            this.modelIds = "";
+    }
+}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/user/model/UserModelCollectQuery.java

+package com.mortals.xhx.module.user.model;
+
+import java.util.List;
+import com.mortals.xhx.module.user.model.UserModelCollectEntity;
+/**
+* 用户模块收藏查询对象
+*
+* @author zxfei
+* @date 2023-08-29
+*/
+public class UserModelCollectQuery extends UserModelCollectEntity {
+    /** 开始 主键，自增长 */
+    private Long idStart;
+
+    /** 结束 主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 主键，自增长 */
+    private Long idIncrement;
+
+    /** 主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 开始 用户ID，主键，自增长 */
+    private Long userIdStart;
+
+    /** 结束 用户ID，主键，自增长 */
+    private Long userIdEnd;
+
+    /** 增加 用户ID，主键，自增长 */
+    private Long userIdIncrement;
+
+    /** 用户ID，主键，自增长列表 */
+    private List <Long> userIdList;
+
+    /** 用户ID，主键，自增长排除列表 */
+    private List <Long> userIdNotList;
+
+    /** 登录名 */
+    private List<String> realNameList;
+
+    /** 登录名排除列表 */
+    private List <String> realNameNotList;
+    /** 收藏模块 */
+    private List<String> modelIdsList;
+
+    /** 收藏模块排除列表 */
+    private List <String> modelIdsNotList;
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<UserModelCollectQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<UserModelCollectQuery> andConditionList;
+
+    public UserModelCollectQuery(){}
+
+    /**
+    * 获取 开始 主键，自增长
+    * @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;
+    }
+
+    /**
+    * 获取 主键，自增长
+    * @return idNotList
+    */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+    * 设置 主键，自增长
+    * @param idNotList
+    */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+    * 获取 开始 用户ID，主键，自增长
+    * @return userIdStart
+    */
+    public Long getUserIdStart(){
+        return this.userIdStart;
+    }
+
+    /**
+    * 设置 开始 用户ID，主键，自增长
+    * @param userIdStart
+    */
+    public void setUserIdStart(Long userIdStart){
+        this.userIdStart = userIdStart;
+    }
+
+    /**
+    * 获取 结束 用户ID，主键，自增长
+    * @return $userIdEnd
+    */
+    public Long getUserIdEnd(){
+        return this.userIdEnd;
+    }
+
+    /**
+    * 设置 结束 用户ID，主键，自增长
+    * @param userIdEnd
+    */
+    public void setUserIdEnd(Long userIdEnd){
+        this.userIdEnd = userIdEnd;
+    }
+
+    /**
+    * 获取 增加 用户ID，主键，自增长
+    * @return userIdIncrement
+    */
+    public Long getUserIdIncrement(){
+        return this.userIdIncrement;
+    }
+
+    /**
+    * 设置 增加 用户ID，主键，自增长
+    * @param userIdIncrement
+    */
+    public void setUserIdIncrement(Long userIdIncrement){
+        this.userIdIncrement = userIdIncrement;
+    }
+
+    /**
+    * 获取 用户ID，主键，自增长
+    * @return userIdList
+    */
+    public List<Long> getUserIdList(){
+        return this.userIdList;
+    }
+
+    /**
+    * 设置 用户ID，主键，自增长
+    * @param userIdList
+    */
+    public void setUserIdList(List<Long> userIdList){
+        this.userIdList = userIdList;
+    }
+
+    /**
+    * 获取 用户ID，主键，自增长
+    * @return userIdNotList
+    */
+    public List<Long> getUserIdNotList(){
+        return this.userIdNotList;
+    }
+
+    /**
+    * 设置 用户ID，主键，自增长
+    * @param userIdNotList
+    */
+    public void setUserIdNotList(List<Long> userIdNotList){
+        this.userIdNotList = userIdNotList;
+    }
+
+
+    /**
+    * 获取 登录名
+    * @return realNameList
+    */
+    public List<String> getRealNameList(){
+        return this.realNameList;
+    }
+
+    /**
+    * 设置 登录名
+    * @param realNameList
+    */
+    public void setRealNameList(List<String> realNameList){
+        this.realNameList = realNameList;
+    }
+
+    /**
+    * 获取 登录名
+    * @return realNameNotList
+    */
+    public List<String> getRealNameNotList(){
+        return this.realNameNotList;
+    }
+
+    /**
+    * 设置 登录名
+    * @param realNameNotList
+    */
+    public void setRealNameNotList(List<String> realNameNotList){
+        this.realNameNotList = realNameNotList;
+    }
+
+    /**
+    * 获取 收藏模块
+    * @return modelIdsList
+    */
+    public List<String> getModelIdsList(){
+        return this.modelIdsList;
+    }
+
+    /**
+    * 设置 收藏模块
+    * @param modelIdsList
+    */
+    public void setModelIdsList(List<String> modelIdsList){
+        this.modelIdsList = modelIdsList;
+    }
+
+    /**
+    * 获取 收藏模块
+    * @return modelIdsNotList
+    */
+    public List<String> getModelIdsNotList(){
+        return this.modelIdsNotList;
+    }
+
+    /**
+    * 设置 收藏模块
+    * @param modelIdsNotList
+    */
+    public void setModelIdsNotList(List<String> modelIdsNotList){
+        this.modelIdsNotList = modelIdsNotList;
+    }
+
+    /**
+    * 获取 开始 创建时间
+    * @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;
+    }
+
+    /**
+    * 设置  主键，自增长
+    * @param id
+    */
+    public UserModelCollectQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 主键，自增长
+    * @param idStart
+    */
+    public UserModelCollectQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 主键，自增长
+    * @param idEnd
+    */
+    public UserModelCollectQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 主键，自增长
+    * @param idIncrement
+    */
+    public UserModelCollectQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 主键，自增长
+    * @param idList
+    */
+    public UserModelCollectQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+        /**
+        * 设置 主键，自增长
+        * @param idNotList
+        */
+        public UserModelCollectQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+        }
+
+    /**
+    * 设置  用户ID，主键，自增长
+    * @param userId
+    */
+    public UserModelCollectQuery userId(Long userId){
+	    setUserId(userId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 用户ID，主键，自增长
+    * @param userIdStart
+    */
+    public UserModelCollectQuery userIdStart(Long userIdStart){
+		this.userIdStart = userIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 用户ID，主键，自增长
+    * @param userIdEnd
+    */
+    public UserModelCollectQuery userIdEnd(Long userIdEnd){
+		this.userIdEnd = userIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 用户ID，主键，自增长
+    * @param userIdIncrement
+    */
+    public UserModelCollectQuery userIdIncrement(Long userIdIncrement){
+		this.userIdIncrement = userIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 用户ID，主键，自增长
+    * @param userIdList
+    */
+    public UserModelCollectQuery userIdList(List<Long> userIdList){
+        this.userIdList = userIdList;
+		return this;
+        }
+
+        /**
+        * 设置 用户ID，主键，自增长
+        * @param userIdNotList
+        */
+        public UserModelCollectQuery userIdNotList(List<Long> userIdNotList){
+        this.userIdNotList = userIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 登录名
+    * @param realName
+    */
+    public UserModelCollectQuery realName(String realName){
+        setRealName(realName);
+		return this;
+    }
+
+    /**
+    * 设置 登录名
+    * @param realNameList
+    */
+    public UserModelCollectQuery realNameList(List<String> realNameList){
+        this.realNameList = realNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 收藏模块
+    * @param modelIds
+    */
+    public UserModelCollectQuery modelIds(String modelIds){
+        setModelIds(modelIds);
+		return this;
+    }
+
+    /**
+    * 设置 收藏模块
+    * @param modelIdsList
+    */
+    public UserModelCollectQuery modelIdsList(List<String> modelIdsList){
+        this.modelIdsList = modelIdsList;
+		return this;
+    }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<UserModelCollectQuery> 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<UserModelCollectQuery> 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<UserModelCollectQuery> 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<UserModelCollectQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/user/model/vo/UserModelCollectVo.java

+package com.mortals.xhx.module.user.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.user.model.UserModelCollectEntity;
+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-08-29
+*/
+@Data
+public class UserModelCollectVo extends BaseEntityLong {
+
+}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/user/service/UserModelCollectService.java

+package com.mortals.xhx.module.user.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.user.model.UserModelCollectEntity;
+import com.mortals.xhx.module.user.dao.UserModelCollectDao;
+/**
+* UserModelCollectService
+*
+* 用户模块收藏 service接口
+*
+* @author zxfei
+* @date 2023-08-29
+*/
+public interface UserModelCollectService extends ICRUDService<UserModelCollectEntity,Long>{
+
+    UserModelCollectDao getDao();
+}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/user/service/impl/UserModelCollectServiceImpl.java

+package com.mortals.xhx.module.user.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.user.dao.UserModelCollectDao;
+import com.mortals.xhx.module.user.model.UserModelCollectEntity;
+import com.mortals.xhx.module.user.service.UserModelCollectService;
+import lombok.extern.slf4j.Slf4j;
+/**
+* UserModelCollectService
+* 用户模块收藏 service实现
+*
+* @author zxfei
+* @date 2023-08-29
+*/
+@Service("userModelCollectService")
+@Slf4j
+public class UserModelCollectServiceImpl extends AbstractCRUDServiceImpl<UserModelCollectDao, UserModelCollectEntity, Long> implements UserModelCollectService {
+    
+}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/user/web/UserModelCollectController.java

+package com.mortals.xhx.module.user.web;
+import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.annotation.RepeatSubmit;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.service.IUser;
+import com.mortals.framework.util.StringUtils;
+import com.mortals.framework.utils.BeanUtil;
+import com.mortals.framework.utils.ReflectUtils;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.user.model.UserModelCollectEntity;
+import com.mortals.xhx.module.user.service.UserModelCollectService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+/**
+*
+* 用户模块收藏
+*
+* @author zxfei
+* @date 2023-08-29
+*/
+@RestController
+@RequestMapping("user/model/collect")
+public class UserModelCollectController extends BaseCRUDJsonBodyMappingController<UserModelCollectService,UserModelCollectEntity,Long> {
+
+    public UserModelCollectController(){
+        super.setModuleDesc( "用户模块收藏");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+    @PostMapping({"get"})
+    public String getCollect() {
+        Map<String, Object> model = new HashMap();
+        JSONObject ret = new JSONObject();
+        String busiDesc = "查看" + this.getModuleDesc();
+        Context context = this.getContext();
+
+        try {
+            UserModelCollectEntity  query = new UserModelCollectEntity();
+            query.setUserId(this.getCurUser().getId());
+            UserModelCollectEntity entity = this.service.selectOne(query);
+            if (entity == null) {
+                entity = new UserModelCollectEntity();
+                entity.setUserId(this.getCurUser().getId());
+                entity.setRealName(this.getCurUser().getRealName());
+                entity.setModelIds("");
+            }
+
+            model.putAll(model);
+            model.put("entity", entity);
+            if (!ObjectUtils.isEmpty(context) && !ObjectUtils.isEmpty(context.getUser())) {
+                this.recordSysLog(this.request, busiDesc + " 【成功】");
+            }
+        } catch (Exception var8) {
+            this.doException(this.request, busiDesc, model, var8);
+            Object msg = model.get("message_info");
+            return this.createFailJsonResp(msg == null ? "系统异常" : msg.toString());
+        }
+
+        this.init(model, context);
+        ret.put("data", model);
+        ret.put("code", 1);
+        ret.put("msg", model.remove("message_info"));
+        return ret.toJSONString();
+    }
+
+    @Override
+    @PostMapping({"save"})
+    @RepeatSubmit
+    public String save(@RequestBody UserModelCollectEntity entity) {
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        int code = 1;
+        String busiDesc = "保存" + this.getModuleDesc();
+        if(StringUtils.isEmpty(entity.getModelIds())){
+            return this.createFailJsonResp("请选择要收藏的模块");
+        }
+        try {
+            UserModelCollectEntity  query = new UserModelCollectEntity();
+            query.setUserId(this.getCurUser().getId());
+            UserModelCollectEntity temp = this.service.selectOne(query);
+            if (temp == null) {
+                Class<UserModelCollectEntity> tClass = ReflectUtils.getClassGenricType(this.getClass(), 1);
+                UserModelCollectEntity initEntity = (UserModelCollectEntity)tClass.newInstance();
+                initEntity.initAttrValue();
+                BeanUtils.copyProperties(entity, initEntity, BeanUtil.getNullPropertyNames(entity));
+                entity = initEntity;
+                busiDesc = "新增" + this.getModuleDesc();
+                initEntity.setCreateTime(new Date());
+                IUser user = this.getCurUser();
+                if (user != null) {
+                    initEntity.setUserId(user.getId());
+                    initEntity.setRealName(user.getRealName());
+                }
+
+                this.service.save(initEntity, context);
+
+            } else {
+                busiDesc = "修改" + this.getModuleDesc();
+                entity.setId(temp.getId());
+                this.service.update(entity, context);
+            }
+
+            model.put("id", entity.getId());
+            code = this.saveAfter(entity, model, context);
+            model.put("entity", entity);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
+        } catch (Exception var9) {
+            this.doException(this.request, busiDesc, model, var9);
+            model.put("entity", entity);
+            this.init(model, context);
+            code = this.saveException(entity, model, context, var9);
+        }
+
+        this.init(model, context);
+        JSONObject ret = new JSONObject();
+        ret.put("code", code);
+        ret.put("msg", model.remove("message_info"));
+        ret.put("data", model);
+        return ret.toJSONString();
+    }
+}
\ No newline at end of file

portal-manager/src/main/resources/sqlmap/module/user/UserModelCollectMapper.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.user.dao.ibatis.UserModelCollectDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="UserModelCollectEntity" id="UserModelCollectEntity-Map">
+            <id  property="id" column="id" />
+            <result property="userId" column="userId" />
+            <result property="realName" column="realName" />
+            <result property="modelIds" column="modelIds" />
+            <result property="createTime" column="createTime" />
+            
+    </resultMap>
+
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                    a.id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('userId') or colPickMode == 1 and data.containsKey('userId')))">
+                    a.userId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('realName') or colPickMode == 1 and data.containsKey('realName')))">
+                    a.realName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('modelIds') or colPickMode == 1 and data.containsKey('modelIds')))">
+                    a.modelIds,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="UserModelCollectEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_user_model_collect
+        (userId,realName,modelIds,createTime)
+        VALUES
+        (#{userId},#{realName},#{modelIds},#{createTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_user_model_collect
+        (userId,realName,modelIds,createTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.userId},#{item.realName},#{item.modelIds},#{item.createTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_user_model_collect as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('userId')) or (colPickMode==1 and !data.containsKey('userId'))">
+                a.userId=#{data.userId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('userIdIncrement')) or (colPickMode==1 and !data.containsKey('userIdIncrement'))">
+                a.userId=ifnull(a.userId,0) + #{data.userIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('realName')) or (colPickMode==1 and !data.containsKey('realName'))">
+                a.realName=#{data.realName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('modelIds')) or (colPickMode==1 and !data.containsKey('modelIds'))">
+                a.modelIds=#{data.modelIds},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_xhx_user_model_collect as a
+        <trim prefix="set" suffixOverrides=",">
+                        <trim prefix="userId=(case" suffix="ELSE userId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('userId')) or (colPickMode==1 and !item.containsKey('userId'))">
+                                        when a.id=#{item.id} then #{item.userId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('userIdIncrement')) or (colPickMode==1 and !item.containsKey('userIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.userId,0) + #{item.userIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="realName=(case" suffix="ELSE realName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('realName')) or (colPickMode==1 and !item.containsKey('realName'))">
+                            when a.id=#{item.id} then #{item.realName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="modelIds=(case" suffix="ELSE modelIds end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('modelIds')) or (colPickMode==1 and !item.containsKey('modelIds'))">
+                            when a.id=#{item.id} then #{item.modelIds}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="UserModelCollectEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_user_model_collect as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_xhx_user_model_collect as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_user_model_collect where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_xhx_user_model_collect where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_xhx_user_model_collect where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_xhx_user_model_collect as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="UserModelCollectEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_user_model_collect as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+        <include refid="_orderCols_"/>
+    </select>
+
+
+
+    <!-- 获取 -->
+    <select id="getListCount" parameterType="paramDto" resultType="int">
+        select count(1)
+        from mortals_xhx_user_model_collect as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                and
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null ">
+                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
+                ${_conditionType_} a.id not in
+                <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+            </if>
+            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('userId')">
+                <if test="conditionParamRef.userId != null ">
+                    ${_conditionType_} a.userId = #{${_conditionParam_}.userId}
+                </if>
+                <if test="conditionParamRef.userId == null">
+                    ${_conditionType_} a.userId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('userIdList') and conditionParamRef.userIdList.size() > 0">
+                ${_conditionType_} a.userId in
+                <foreach collection="conditionParamRef.userIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('userIdNotList') and conditionParamRef.userIdNotList.size() > 0">
+                ${_conditionType_} a.userId not in
+                <foreach collection="conditionParamRef.userIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('userIdStart') and conditionParamRef.userIdStart != null">
+                ${_conditionType_} a.userId <![CDATA[ >= ]]> #{${_conditionParam_}.userIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('userIdEnd') and conditionParamRef.userIdEnd != null">
+                ${_conditionType_} a.userId <![CDATA[ <= ]]> #{${_conditionParam_}.userIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('realName')">
+                <if test="conditionParamRef.realName != null and conditionParamRef.realName != ''">
+                    ${_conditionType_} a.realName like #{${_conditionParam_}.realName}
+                </if>
+                <if test="conditionParamRef.realName == null">
+                    ${_conditionType_} a.realName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('realNameList') and conditionParamRef.realNameList.size() > 0">
+                ${_conditionType_} a.realName in
+                <foreach collection="conditionParamRef.realNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('realNameNotList') and conditionParamRef.realNameNotList.size() > 0">
+                ${_conditionType_} a.realName not in
+                <foreach collection="conditionParamRef.realNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('modelIds')">
+                <if test="conditionParamRef.modelIds != null and conditionParamRef.modelIds != ''">
+                    ${_conditionType_} a.modelIds like #{${_conditionParam_}.modelIds}
+                </if>
+                <if test="conditionParamRef.modelIds == null">
+                    ${_conditionType_} a.modelIds is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('modelIdsList') and conditionParamRef.modelIdsList.size() > 0">
+                ${_conditionType_} a.modelIds in
+                <foreach collection="conditionParamRef.modelIdsList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('modelIdsNotList') and conditionParamRef.modelIdsNotList.size() > 0">
+                ${_conditionType_} a.modelIds not in
+                <foreach collection="conditionParamRef.modelIdsNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.createTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     ${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                    <if test="orderCol.containsKey('id')">
+                        a.id
+                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('userId')">
+                        a.userId
+                        <if test='orderCol.userId != null and "DESC".equalsIgnoreCase(orderCol.userId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('realName')">
+                        a.realName
+                        <if test='orderCol.realName != null and "DESC".equalsIgnoreCase(orderCol.realName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('modelIds')">
+                        a.modelIds
+                        <if test='orderCol.modelIds != null and "DESC".equalsIgnoreCase(orderCol.modelIds)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+            </trim>
+        </if>
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file