[task-1585]快捷导航增加排序接口

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

@@ -39,6 +39,16 @@ public class PartyUserNavigateTbl extends AbstractPo<String> {
   protected String urlAddr;
   @ApiModelProperty(value = "是否显示")
   protected String display;
+  @ApiModelProperty(value = "排序")
+  protected Long sn;
+
+  public Long getSn() {
+    return sn;
+  }
+
+  public void setSn(Long sn) {
+    this.sn = sn;
+  }
 
   @Override
   public void setId(String id) {

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

@@ -14,19 +14,20 @@
         <result property="urlName" column="url_name_" jdbcType="VARCHAR"/>
         <result property="urlAddr" column="url_addr_" jdbcType="VARCHAR"/>
         <result property="display" column="display_" jdbcType="VARCHAR"/>
+        <result property="sn" column="sn_" jdbcType="NUMERIC"/>
     </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_
+        id_,tenant_id_,ip_,create_by_,create_time_,update_by_,update_time_,user_id_,di_dian_,url_name_,url_addr_,display_,sn_
     </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_)
+        (ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,USER_ID_,DI_DIAN_,URL_NAME_,URL_ADDR_,DISPLAY_,SN_)
         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})
+         #{diDian,jdbcType=VARCHAR},#{urlName,jdbcType=VARCHAR},#{urlAddr,jdbcType=VARCHAR},#{display,jdbcType=VARCHAR},#{sn,jdbcType=NUMERIC})
     </insert>
 
     <select id="get"  parameterType="java.lang.String" resultMap="PartyUserNavigate">
@@ -35,21 +36,34 @@
 
     <select id="findByUserId"  parameterType="java.util.Map" resultMap="PartyUserNavigate">
         SELECT <include refid="columns"/> FROM IBPS_PARTY_USER_NAVIGATE
-        WHERE USER_ID_ = #{userId} ORDER BY CREATE_TIME_
+        WHERE USER_ID_ = #{userId} ORDER BY SN_,CREATE_TIME_ DESC
     </select>
 
     <select id="findIdsByUserId"  parameterType="java.util.Map" resultMap="PartyUserNavigate">
         SELECT ID_ FROM FROM IBPS_PARTY_USER_NAVIGATE
-        WHERE USER_ID_ = #{userId} ORDER BY CREATE_TIME_
+        WHERE USER_ID_ = #{userId} ORDER BY SN_,CREATE_TIME_ DESC
     </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}
+            <if test="updateBy !='' and updateBy !=null ">
+                UPDATE_BY_ = #{updateBy,jdbcType=VARCHAR}
+            </if>
+            <if test="updateTime !=null ">
+                ,UPDATE_TIME_ = #{updateTime,jdbcType=TIMESTAMP}
+            </if>
+            <if test="urlName !='' and urlName !=null ">
+                ,URL_NAME_ = #{urlName,jdbcType=VARCHAR},
+            </if>
+            <if test="urlAddr !='' and urlAddr !=null ">
+                ,URL_ADDR_ = #{urlAddr,jdbcType=VARCHAR}
+            </if>
+            <if test="display !='' and display !=null ">
+                ,DISPLAY_ = #{display,jdbcType=VARCHAR}
+            </if>
+            <if test="sn !=null ">
+                ,SN_ = #{sn,jdbcType=NUMERIC}
+            </if>
         WHERE ID_=#{id}
     </update>
 

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

@@ -180,6 +180,13 @@ public interface IDesktopFacadeService {
 	public APIResult<Void> removeNavigate(
 			@RequestParam(name = "navigateIds", required = true)String[] navigateIds);
 
+	/**
+	 * 保存导航排序
+	 */
+	@RequestMapping(value = "/navigate/order", method = { RequestMethod.POST })
+	public APIResult<Void> saveOrder(
+			@RequestParam(name = "orders", required = true)String[] orders);
+
 	/**
 	 * 新增 或 修改用户 日历日程
 	 */

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

@@ -140,7 +140,7 @@ public class DesktopFacadeProvider extends GenericProvider implements IDesktopFa
 			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);
+			setExceptionResult(result, StateEnum.ERROR_SYSTEM_DESKTOP.getCode(), "保存用户导航信息异常！", e);
 		}
 		return result;
 	}
@@ -153,7 +153,7 @@ public class DesktopFacadeProvider extends GenericProvider implements IDesktopFa
 			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);
+			setExceptionResult(result, StateEnum.ERROR_SYSTEM_DESKTOP.getCode(), "用户导航信息查询异常！", e);
 		}
 		return result;
 	}
@@ -169,7 +169,31 @@ public class DesktopFacadeProvider extends GenericProvider implements IDesktopFa
 			navigate.deleteByIds(navigateIds);
 			result.setMessage("删除用户导航成功！");
 		} catch (Exception e) {
-			setExceptionResult(result, StateEnum.ERROR_SYSTEM_DESKTOP.getCode(), I18nUtil.getMessage(StateEnum.ERROR_SYSTEM_DESKTOP.getCode()+""), e);
+			setExceptionResult(result, StateEnum.ERROR_SYSTEM_DESKTOP.getCode(), "删除用户导航异常！", e);
+		}
+		return result;
+	}
+
+	@ApiOperation(value = "保存用户导航排序", notes = "保存用户导航排序")
+	@Override
+	public APIResult<Void> saveOrder(
+			@ApiParam(name = "orders", value = "用户导航id数组", required = true)
+			@RequestParam(name = "orders", required = true)String[] orders) {
+		APIResult<Void> result = new APIResult<>();
+		try {
+			if (BeanUtils.isNotEmpty(orders)){
+				PartyUserNavigatePo navigatePo = new PartyUserNavigatePo();
+				for (int i = 0;i < orders.length;i++) {
+					navigatePo.setId(orders[i]);
+					navigatePo.setSn((long) i);
+					navigatePo.setUpdateBy(ContextUtil.getCurrentUserId());
+					navigatePo.setUpdateTime(new Date());
+					navigateDao.update(navigatePo);
+				}
+			}
+			result.setMessage("保存用户导航排序成功！");
+		} catch (Exception e) {
+			setExceptionResult(result, StateEnum.ERROR_SYSTEM_DESKTOP.getCode(), "保存用户导航排序异常！", e);
 		}
 		return result;
 	}
@@ -197,7 +221,7 @@ public class DesktopFacadeProvider extends GenericProvider implements IDesktopFa
 			result.setMessage("用户日历日程保存成功！");
 			result.addVariable("id", partyUserCalendarPo.getId());
 		} catch (Exception e) {
-			setExceptionResult(result, StateEnum.ERROR_SYSTEM_DESKTOP.getCode(), I18nUtil.getMessage(StateEnum.ERROR_SYSTEM_DESKTOP.getCode()+""), e);
+			setExceptionResult(result, StateEnum.ERROR_SYSTEM_DESKTOP.getCode(),"保存日历日程异常！", e);
 		}
 		return result;
 	}
@@ -210,7 +234,7 @@ public class DesktopFacadeProvider extends GenericProvider implements IDesktopFa
 			List<PartyUserCalendarPo> calendarPoList = calendarRepository.findByUserId(ContextUtil.getCurrentUserId());
 			result.setData(calendarPoList);
 		} catch (Exception e) {
-			setExceptionResult(result, StateEnum.ERROR_SYSTEM_DESKTOP.getCode(), I18nUtil.getMessage(StateEnum.ERROR_SYSTEM_DESKTOP.getCode()+""), e);
+			setExceptionResult(result, StateEnum.ERROR_SYSTEM_DESKTOP.getCode(), "查询日历日程异常！", e);
 		}
 		return result;
 	}
@@ -225,7 +249,7 @@ public class DesktopFacadeProvider extends GenericProvider implements IDesktopFa
 			calendarDao.deleteByIds(calendarIds);
 			result.setMessage("删除用户日历日程成功！");
 		} catch (Exception e) {
-			setExceptionResult(result, StateEnum.ERROR_SYSTEM_DESKTOP.getCode(), I18nUtil.getMessage(StateEnum.ERROR_SYSTEM_DESKTOP.getCode()+""), e);
+			setExceptionResult(result, StateEnum.ERROR_SYSTEM_DESKTOP.getCode(), "删除日历日程异常！", e);
 		}
 		return result;
 	}