[task-1413]-子-新首页开发/首页-快捷导航功能数据无法保存问题修复接口

ibps-common-root/modules/org-biz/src/main/java/com/lc/ibps/org/party/domain/PartyUserNavigate.java

@@ -0,0 +1,33 @@
+package com.lc.ibps.org.party.domain;
+
+import com.lc.ibps.base.framework.domain.AbstractDomain;
+import com.lc.ibps.base.framework.persistence.dao.IDao;
+import com.lc.ibps.org.party.persistence.dao.PartyUserNavigateDao;
+import com.lc.ibps.org.party.persistence.entity.PartyUserNavigatePo;
+import org.springframework.context.annotation.Scope;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+/**
+ * @author gaozl
+ */
+@SuppressWarnings("serial")
+@Transactional
+@Scope("prototype")
+public class PartyUserNavigate extends AbstractDomain<String, PartyUserNavigatePo> {
+
+    @Resource
+    private PartyUserNavigateDao userNavigateDao;
+
+    @Override
+    protected void init() {
+
+    }
+
+    @Override
+    protected IDao<String, PartyUserNavigatePo> getInternalDao() {
+        return userNavigateDao;
+    }
+
+}

ibps-common-root/modules/org-biz/src/main/java/com/lc/ibps/org/party/persistence/dao/PartyUserNavigateDao.java

@@ -0,0 +1,15 @@
+package com.lc.ibps.org.party.persistence.dao;
+
+import com.lc.ibps.base.framework.persistence.dao.IDao;
+import com.lc.ibps.org.party.persistence.entity.PartyUserNavigatePo;
+
+/**
+ * @author gaozl
+ */
+public interface PartyUserNavigateDao extends IDao<String, PartyUserNavigatePo> {
+
+
+
+
+
+}

ibps-common-root/modules/org-biz/src/main/java/com/lc/ibps/org/party/persistence/dao/PartyUserNavigateQueryDao.java

@@ -0,0 +1,12 @@
+package com.lc.ibps.org.party.persistence.dao;
+
+import com.lc.ibps.base.framework.persistence.dao.IQueryDao;
+import com.lc.ibps.org.party.persistence.entity.PartyUserNavigatePo;
+
+/**
+ * @author Administrator
+ */
+public interface PartyUserNavigateQueryDao extends IQueryDao<String, PartyUserNavigatePo> {
+
+
+}

ibps-common-root/modules/org-biz/src/main/java/com/lc/ibps/org/party/persistence/dao/impl/PartyUserNavigateDaoImpl.java

@@ -0,0 +1,21 @@
+package com.lc.ibps.org.party.persistence.dao.impl;
+
+import com.lc.ibps.base.db.ddd.dao.MyBatisDaoImpl;
+import com.lc.ibps.org.party.persistence.dao.PartyUserNavigateDao;
+import com.lc.ibps.org.party.persistence.entity.PartyUserNavigatePo;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author Administrator
+ */
+@Repository
+public class PartyUserNavigateDaoImpl extends MyBatisDaoImpl<String, PartyUserNavigatePo> implements PartyUserNavigateDao {
+
+
+    @Override
+    public String getNamespace() {
+        return PartyUserNavigatePo.class.getName();
+    }
+
+
+}

ibps-common-root/modules/org-biz/src/main/java/com/lc/ibps/org/party/persistence/dao/impl/PartyUserNavigateQueryDaoImpl.java

@@ -0,0 +1,20 @@
+package com.lc.ibps.org.party.persistence.dao.impl;
+
+import com.lc.ibps.base.db.ddd.dao.MyBatisQueryDaoImpl;
+import com.lc.ibps.org.party.persistence.dao.PartyUserNavigateQueryDao;
+import com.lc.ibps.org.party.persistence.entity.PartyUserNavigatePo;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author Administrator
+ */
+@SuppressWarnings("serial")
+@Repository
+public class PartyUserNavigateQueryDaoImpl extends MyBatisQueryDaoImpl<String, PartyUserNavigatePo> implements PartyUserNavigateQueryDao {
+
+    @Override
+    public String getNamespace() {
+        return PartyUserNavigatePo.class.getName();
+    }
+
+}

ibps-common-root/modules/org-biz/src/main/java/com/lc/ibps/org/party/repository/impl/PartyUserNavigateRepositoryImpl.java

@@ -0,0 +1,51 @@
+package com.lc.ibps.org.party.repository.impl;
+
+import com.lc.ibps.base.core.util.AppUtil;
+import com.lc.ibps.base.framework.persistence.dao.IQueryDao;
+import com.lc.ibps.base.framework.repository.AbstractRepository;
+import com.lc.ibps.org.party.domain.PartyUserNavigate;
+import com.lc.ibps.org.party.persistence.dao.PartyUserNavigateQueryDao;
+import com.lc.ibps.org.party.persistence.entity.PartyUserNavigatePo;
+import com.lc.ibps.org.party.repository.PartyUserNavigateRepository;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+@Repository
+public class PartyUserNavigateRepositoryImpl extends AbstractRepository<String, PartyUserNavigatePo, PartyUserNavigate> implements PartyUserNavigateRepository {
+
+    @Resource
+    private PartyUserNavigateQueryDao userNavigateQueryDao;
+
+
+    @Override
+    public PartyUserNavigate newInstance() {
+        PartyUserNavigatePo userNavigatePo = new PartyUserNavigatePo();
+        PartyUserNavigate userNavigate = AppUtil.getBean(PartyUserNavigate.class);
+        userNavigate.setData(userNavigatePo);
+        return userNavigate;
+    }
+
+    @Override
+    public PartyUserNavigate newInstance(PartyUserNavigatePo po) {
+        PartyUserNavigate userNavigate = AppUtil.getBean(PartyUserNavigate.class);
+        userNavigate.setData(po);
+        return userNavigate;
+    }
+
+    @Override
+    public List<PartyUserNavigatePo> findByUserId(String userId) {
+        return findByKey("findByUserId", "findIdsByUserId",
+                b().a("userId", userId).p());
+    }
+
+
+    @Override
+    protected IQueryDao<String, PartyUserNavigatePo> getQueryDao() {
+        return userNavigateQueryDao;
+    }
+}

ibps-model-root/modules/org-model/src/main/java/com/lc/ibps/org/party/persistence/entity/PartyUserNavigatePo.java

@@ -0,0 +1,13 @@
+package com.lc.ibps.org.party.persistence.entity;
+
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @author gaozl
+ */
+@ApiModel(value = "用户导航对象")
+public class PartyUserNavigatePo extends PartyUserNavigateTbl {
+
+    private static final long serialVersionUID = -7779379169938820446L;
+
+}

ibps-model-root/modules/org-model/src/main/java/com/lc/ibps/org/party/persistence/entity/PartyUserNavigateTbl.java

@@ -0,0 +1,152 @@
+package com.lc.ibps.org.party.persistence.entity;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lc.ibps.base.core.constants.StringPool;
+import com.lc.ibps.base.framework.persistence.entity.AbstractPo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+/**
+ * @author Administrator
+ */
+@ApiModel(value = "用户导航")
+public class PartyUserNavigateTbl extends AbstractPo<String> {
+
+  private static final long serialVersionUID = -1756380409408587473L;
+  @ApiModelProperty(value = "主键")
+  protected String id;
+  protected String tenantId;
+  protected String ip;
+  @ApiModelProperty(value = "创建人")
+  protected String createBy;
+  @ApiModelProperty(value = "创建时间")
+  @JsonFormat(pattern = StringPool.DATE_FORMAT_DATETIME, timezone = "GMT+8")
+  protected java.util.Date createTime;
+  protected String updateBy;
+  @ApiModelProperty(value = "更新时间")
+  @JsonFormat(pattern = StringPool.DATE_FORMAT_DATETIME, timezone = "GMT+8")
+  protected java.util.Date updateTime;
+  @ApiModelProperty(value = "用户ID")
+  protected String userId;
+  @ApiModelProperty(value = "地点")
+  protected String diDian;
+  @ApiModelProperty(value = "url名称")
+  protected String urlName;
+  @ApiModelProperty(value = "url地址")
+  protected String urlAddr;
+  @ApiModelProperty(value = "是否显示")
+  protected String display;
+
+  @Override
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  @Override
+  public String getId() {
+    return this.id;
+  }
+
+  public String getUserId() {
+    return userId;
+  }
+
+  public void setUserId(String userId) {
+    this.userId = userId;
+  }
+
+  @Override
+  public String getTenantId() {
+    return tenantId;
+  }
+
+  @Override
+  public void setTenantId(String tenantId) {
+    this.tenantId = tenantId;
+  }
+
+  @Override
+  public String getIp() {
+    return ip;
+  }
+
+  @Override
+  public void setIp(String ip) {
+    this.ip = ip;
+  }
+
+  @Override
+  public String getCreateBy() {
+    return createBy;
+  }
+
+  @Override
+  public void setCreateBy(String createBy) {
+    this.createBy = createBy;
+  }
+
+  @Override
+  public Date getCreateTime() {
+    return createTime;
+  }
+
+  @Override
+  public void setCreateTime(Date createTime) {
+    this.createTime = createTime;
+  }
+
+  @Override
+  public String getUpdateBy() {
+    return updateBy;
+  }
+
+  @Override
+  public void setUpdateBy(String updateBy) {
+    this.updateBy = updateBy;
+  }
+
+  @Override
+  public Date getUpdateTime() {
+    return updateTime;
+  }
+
+  @Override
+  public void setUpdateTime(Date updateTime) {
+    this.updateTime = updateTime;
+  }
+
+  public String getDiDian() {
+    return diDian;
+  }
+
+  public void setDiDian(String diDian) {
+    this.diDian = diDian;
+  }
+
+  public String getUrlName() {
+    return urlName;
+  }
+
+  public void setUrlName(String urlName) {
+    this.urlName = urlName;
+  }
+
+  public String getUrlAddr() {
+    return urlAddr;
+  }
+
+  public void setUrlAddr(String urlAddr) {
+    this.urlAddr = urlAddr;
+  }
+
+  public String getDisplay() {
+    return display;
+  }
+
+  public void setDisplay(String display) {
+    this.display = display;
+  }
+}

ibps-model-root/modules/org-model/src/main/resources/com/lc/ibps/org/party/persistence/mapping/PartyUserNavigate.map.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lc.ibps.org.party.persistence.entity.PartyUserNavigatePo">
+    <resultMap id="PartyUserNavigate" type="com.lc.ibps.org.party.persistence.entity.PartyUserNavigatePo">
+        <id property="id" column="ID_" jdbcType="VARCHAR"/>
+        <result property="tenantId" column="tenant_id_" jdbcType="VARCHAR"/>
+        <result property="ip" column="ip_" jdbcType="VARCHAR"/>
+        <result property="createBy" column="create_by_" jdbcType="VARCHAR"/>
+        <result property="createTime" column="create_time_" jdbcType="TIMESTAMP"/>
+        <result property="updateBy" column="update_by_" jdbcType="VARCHAR"/>
+        <result property="updateTime" column="update_time_" jdbcType="TIMESTAMP"/>
+        <result property="userId" column="user_id_" jdbcType="VARCHAR"/>
+        <result property="diDian" column="di_dian_" jdbcType="VARCHAR"/>
+        <result property="urlName" column="url_name_" jdbcType="VARCHAR"/>
+        <result property="urlAddr" column="url_addr_" jdbcType="VARCHAR"/>
+        <result property="display" column="display_" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="columns">
+        id_,tenant_id_,ip_,create_by_,create_time_,update_by_,update_time_,user_id_,di_dian_,url_name_,url_addr_,display_
+    </sql>
+
+    <insert id="create" parameterType="com.lc.ibps.org.party.persistence.entity.PartyUserNavigatePo">
+        INSERT INTO IBPS_PARTY_USER_NAVIGATE
+        (ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,USER_ID_,DI_DIAN_,URL_NAME_,URL_ADDR_,DISPLAY_)
+        VALUES
+        (#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR},#{createBy,jdbcType=VARCHAR},
+         #{createTime,jdbcType=TIMESTAMP},#{updateBy,jdbcType=VARCHAR},#{updateTime,jdbcType=TIMESTAMP},#{userId,jdbcType=VARCHAR},
+         #{diDian,jdbcType=VARCHAR},#{urlName,jdbcType=VARCHAR},#{urlAddr,jdbcType=VARCHAR},#{display,jdbcType=VARCHAR})
+    </insert>
+
+    <select id="get"  parameterType="java.lang.String" resultMap="PartyUserNavigate">
+        SELECT <include refid="columns"/> FROM IBPS_PARTY_USER_NAVIGATE WHERE ID_=#{id}
+    </select>
+
+    <select id="findByUserId"  parameterType="java.util.Map" resultMap="PartyUserNavigate">
+        SELECT <include refid="columns"/> FROM IBPS_PARTY_USER_NAVIGATE
+        WHERE USER_ID_ = #{userId}
+    </select>
+
+    <select id="findIdsByUserId"  parameterType="java.util.Map" resultMap="PartyUserNavigate">
+        SELECT ID_ FROM FROM IBPS_PARTY_USER_NAVIGATE
+        WHERE USER_ID_ = #{userId}
+    </select>
+
+    <update id="update" parameterType="com.lc.ibps.org.party.persistence.entity.PartyEmployeePo">
+        UPDATE IBPS_PARTY_USER_NAVIGATE SET
+                                            UPDATE_BY_ = #{updateBy,jdbcType=VARCHAR},
+                                            UPDATE_TIME_ = #{updateTime,jdbcType=TIMESTAMP},
+                                            URL_NAME_ = #{urlName,jdbcType=VARCHAR},
+                                            URL_ADDR_ = #{urlAddr,jdbcType=VARCHAR},
+                                            DISPLAY_ = #{display,jdbcType=VARCHAR}
+        WHERE ID_=#{id}
+    </update>
+
+    <delete id="remove" parameterType="java.lang.String">
+        DELETE FROM IBPS_PARTY_USER_NAVIGATE WHERE ID_=#{id}
+    </delete>
+
+</mapper>

ibps-provider-base-root/modules/provider-platform-api/src/main/java/com/lc/ibps/common/api/IDesktopFacadeService.java

@@ -1,17 +1,16 @@
 package com.lc.ibps.common.api;
 
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.lc.ibps.cloud.entity.APIResult;
 import com.lc.ibps.common.desktop.entity.Favorites;
 import com.lc.ibps.common.desktop.entity.Infobox;
 import com.lc.ibps.common.system.persistence.entity.NewsPo;
+import com.lc.ibps.org.party.persistence.entity.PartyUserNavigatePo;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 桌面管理数据展示门面 接口类
@@ -159,5 +158,24 @@ public interface IDesktopFacadeService {
 	 */
 	@RequestMapping(value = "/taskChange", method = { RequestMethod.GET })
 	public APIResult<List<?>> taskChange();
-	
+
+	/**
+	 * 新增 或 修改用户导航
+	 */
+	@RequestMapping(value = "/navigate/save", method = RequestMethod.POST)
+	public APIResult<Void> save(
+			@RequestBody(required = true) @Valid PartyUserNavigatePo userNavigatePo);
+
+	/**
+	 * 查询当前用户导航
+	 */
+	@RequestMapping(value = "/navigate/findAllByCurrUserId", method = { RequestMethod.GET })
+	public APIResult<List<PartyUserNavigatePo>> findAllByCurrUserId();
+
+	/**
+	 * 根据id 删除导航
+	 */
+	@RequestMapping(value = "/navigate/remove", method = { RequestMethod.POST })
+	public APIResult<Void> remove(
+			@RequestParam(name = "navigateIds", required = true)String[] navigateIds);
 }

ibps-provider-root/modules/provider-platform-default/src/main/java/com/lc/ibps/common/provider/DesktopFacadeProvider.java

@@ -1,17 +1,5 @@
 package com.lc.ibps.common.provider;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-import org.slf4j.event.Level;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.lc.ibps.api.base.constants.StateEnum;
 import com.lc.ibps.api.base.model.PartyEntity;
 import com.lc.ibps.api.base.model.User;
@@ -35,11 +23,7 @@ import com.lc.ibps.base.web.context.ContextUtil;
 import com.lc.ibps.base.web.context.RequestContext;
 import com.lc.ibps.bpmn.api.IBpmInstService;
 import com.lc.ibps.bpmn.api.IBpmTaskChangeService;
-import com.lc.ibps.bpmn.persistence.entity.BpmApprovePo;
-import com.lc.ibps.bpmn.persistence.entity.BpmDefinePo;
-import com.lc.ibps.bpmn.persistence.entity.BpmInstPo;
-import com.lc.ibps.bpmn.persistence.entity.BpmTaskChangePo;
-import com.lc.ibps.bpmn.persistence.entity.BpmTaskPo;
+import com.lc.ibps.bpmn.persistence.entity.*;
 import com.lc.ibps.bpmn.persistence.model.BpmTaskVo;
 import com.lc.ibps.cloud.constants.ParameterKey;
 import com.lc.ibps.cloud.entity.APIPageList;
@@ -60,17 +44,29 @@ import com.lc.ibps.office.api.IBpmInitiatedService;
 import com.lc.ibps.office.api.IBpmReceivedService;
 import com.lc.ibps.org.auth.persistence.entity.ResourcesPo;
 import com.lc.ibps.org.auth.repository.ResourcesRepository;
+import com.lc.ibps.org.party.domain.PartyUserNavigate;
+import com.lc.ibps.org.party.persistence.dao.PartyUserNavigateDao;
 import com.lc.ibps.org.party.persistence.entity.PartyEmployeePo;
 import com.lc.ibps.org.party.persistence.entity.PartyPositionPo;
+import com.lc.ibps.org.party.persistence.entity.PartyUserNavigatePo;
 import com.lc.ibps.org.party.persistence.entity.PartyUserPo;
 import com.lc.ibps.org.party.repository.PartyEmployeeRepository;
 import com.lc.ibps.org.party.repository.PartyPositionRepository;
+import com.lc.ibps.org.party.repository.PartyUserNavigateRepository;
 import com.lc.ibps.org.spi.SpiUserService;
 import com.lc.ibps.org.spi.SpiUserServiceUtil;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import net.sf.json.JSONObject;
+import org.slf4j.event.Level;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.*;
 
 /**
  * 桌面管理数据展示门面实现类
@@ -107,9 +103,71 @@ public class DesktopFacadeProvider extends GenericProvider implements IDesktopFa
 	private IBpmInstService bpmInstService;
 	@Resource
 	private InnerMessageRepository innerMessageRepository;
-	
+	@Autowired
+	private PartyUserNavigateRepository userNavigateRepository;
+
+	@Resource
+	private PartyUserNavigateDao navigateDao;
+
 	private int pageNo = 1;
 	private int limit = 15;
+
+	@ApiOperation(value = "保存", notes = "保存用户导航")
+	@Override
+	public APIResult<Void> save(@Valid PartyUserNavigatePo userNavigatePo) {
+		APIResult<Void> result = new APIResult<>();
+		try {
+			String userId = ContextUtil.getCurrentUserId();
+			userNavigatePo.setUserId(userId);
+			userNavigatePo.setIp(ContextUtil.getCurrentUserIp());
+			PartyUserNavigatePo navigate = userNavigateRepository.get(userNavigatePo.getId());
+			if (BeanUtils.isEmpty(navigate)){
+				userNavigatePo.setId(UniqueIdUtil.getId());
+				userNavigatePo.setCreateBy(userId);
+				navigateDao.create(userNavigatePo);
+			}else {
+				userNavigatePo.setUpdateBy(userId);
+				userNavigatePo.setUpdateTime(new Date());
+				navigateDao.update(userNavigatePo);
+			}
+//			PartyUserNavigate userNavigate = userNavigateRepository.newInstance(userNavigatePo);
+//			userNavigate.save();// 不存在则新增，存在就更新
+			result.setMessage("用户导航保存成功！");
+			result.addVariable("id", userNavigatePo.getId());
+		} catch (Exception e) {
+			setExceptionResult(result, StateEnum.ERROR_SYSTEM_DESKTOP.getCode(), I18nUtil.getMessage(StateEnum.ERROR_SYSTEM_DESKTOP.getCode()+""), e);
+		}
+		return result;
+	}
+
+	@ApiOperation(value = "查询当前用户所有导航信息", notes = "查询当前用户所有导航信息")
+	@Override
+	public APIResult<List<PartyUserNavigatePo>> findAllByCurrUserId() {
+		APIResult<List<PartyUserNavigatePo>> result = new APIResult<>();
+		try {
+			List<PartyUserNavigatePo> navigatePoList = userNavigateRepository.findByUserId(ContextUtil.getCurrentUserId());
+			result.setData(navigatePoList);
+		} catch (Exception e) {
+			setExceptionResult(result, StateEnum.ERROR_SYSTEM_DESKTOP.getCode(), I18nUtil.getMessage(StateEnum.ERROR_SYSTEM_DESKTOP.getCode()+""), e);
+		}
+		return result;
+	}
+
+	@ApiOperation(value = "批量删除", notes = "批量删除用户导航")
+	@Override
+	public APIResult<Void> remove(
+			@ApiParam(name = "navigateIds", value = "用户导航id数组", required = true)
+			@RequestParam(name = "navigateIds", required = true)String[] navigateIds) {
+		APIResult<Void> result = new APIResult<>();
+		try {
+			PartyUserNavigate navigate = userNavigateRepository.newInstance();
+			navigate.deleteByIds(navigateIds);
+			result.setMessage("删除用户导航成功！");
+		} catch (Exception e) {
+			setExceptionResult(result, StateEnum.ERROR_SYSTEM_DESKTOP.getCode(), I18nUtil.getMessage(StateEnum.ERROR_SYSTEM_DESKTOP.getCode()+""), e);
+		}
+		return result;
+	}
 	
 	@SuppressWarnings("unchecked")
 	@ApiOperation(value = "个人信息", notes = "个人信息")