Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
zelong.shao
6a53fe16 1 parent 648f9637

task|阈值添加

Inline Side-by-side
Showing 13 changed files with 257 additions and 19 deletions
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
24 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" /> 24 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
25 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" /> 25 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
26 <result column="CONFIRM_PROMPTS" jdbcType="NUMERIC" property="confirmPrompts" /> 26 <result column="CONFIRM_PROMPTS" jdbcType="NUMERIC" property="confirmPrompts" />
27 + <result column="addflag1" jdbcType="NUMERIC" property="addflag1" />
28 + <result column="addflag2" jdbcType="NUMERIC" property="addflag2" />
27 </resultMap> 29 </resultMap>
28 <sql id="Example_Where_Clause"> 30 <sql id="Example_Where_Clause">
29 <where> 31 <where>
...@@ -87,7 +89,7 @@ ...@@ -87,7 +89,7 @@
87 ID, LOGIN_NAME, USER_NAME, PASSWORD, USER_UUID, EMAIL, PHONE, COMPANY_NAME, ACCOUNT_NO, 89 ID, LOGIN_NAME, USER_NAME, PASSWORD, USER_UUID, EMAIL, PHONE, COMPANY_NAME, ACCOUNT_NO,
88 UNIFIED_BUSINESS_NUM, CUSTOMS_SERIAL_NUM, TYPE_CODE, TYPE_NAME, STATUS, REMARK, CREATE_TIME, 90 UNIFIED_BUSINESS_NUM, CUSTOMS_SERIAL_NUM, TYPE_CODE, TYPE_NAME, STATUS, REMARK, CREATE_TIME,
89 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, 91 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME,
90 - CONFIRM_PROMPTS 92 + CONFIRM_PROMPTS, addflag1, addflag2
91 </sql> 93 </sql>
92 <select id="selectByExample" parameterType="com.fedex.connect.common.model.sys.UserExample" resultMap="BaseResultMap"> 94 <select id="selectByExample" parameterType="com.fedex.connect.common.model.sys.UserExample" resultMap="BaseResultMap">
93 <include refid="OracleDialectPrefix" /> 95 <include refid="OracleDialectPrefix" />
...@@ -133,7 +135,8 @@ ...@@ -133,7 +135,8 @@
133 TYPE_NAME, STATUS, REMARK, 135 TYPE_NAME, STATUS, REMARK,
134 CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 136 CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
135 MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, 137 MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME,
136 - CONFIRM_PROMPTS) 138 + CONFIRM_PROMPTS, addflag1, addflag2
139 + )
137 values (#{id,jdbcType=NUMERIC}, #{loginName,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, 140 values (#{id,jdbcType=NUMERIC}, #{loginName,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR},
138 #{password,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, 141 #{password,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR},
139 #{phone,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{accountNo,jdbcType=VARCHAR}, 142 #{phone,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{accountNo,jdbcType=VARCHAR},
...@@ -141,7 +144,8 @@ ...@@ -141,7 +144,8 @@
141 #{typeName,jdbcType=VARCHAR}, #{status,jdbcType=NUMERIC}, #{remark,jdbcType=VARCHAR}, 144 #{typeName,jdbcType=VARCHAR}, #{status,jdbcType=NUMERIC}, #{remark,jdbcType=VARCHAR},
142 #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, 145 #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR},
143 #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}, 146 #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR},
144 - #{confirmPrompts,jdbcType=NUMERIC}) 147 + #{confirmPrompts,jdbcType=NUMERIC}, #{addflag1,jdbcType=NUMERIC}, #{addflag2,jdbcType=NUMERIC}
148 + )
145 </insert> 149 </insert>
146 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.sys.User"> 150 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.sys.User">
147 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 151 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
...@@ -213,6 +217,12 @@ ...@@ -213,6 +217,12 @@
213 <if test="confirmPrompts != null"> 217 <if test="confirmPrompts != null">
214 CONFIRM_PROMPTS, 218 CONFIRM_PROMPTS,
215 </if> 219 </if>
220 + <if test="addflag1 != null">
221 + addflag1,
222 + </if>
223 + <if test="addflag2 != null">
224 + addflag2,
225 + </if>
216 </trim> 226 </trim>
217 <trim prefix="values (" suffix=")" suffixOverrides=","> 227 <trim prefix="values (" suffix=")" suffixOverrides=",">
218 #{id,jdbcType=NUMERIC}, 228 #{id,jdbcType=NUMERIC},
...@@ -279,6 +289,12 @@ ...@@ -279,6 +289,12 @@
279 <if test="confirmPrompts != null"> 289 <if test="confirmPrompts != null">
280 #{confirmPrompts,jdbcType=NUMERIC}, 290 #{confirmPrompts,jdbcType=NUMERIC},
281 </if> 291 </if>
292 + <if test="addflag1 != null">
293 + #{addflag1,jdbcType=NUMERIC},
294 + </if>
295 + <if test="addflag2 != null">
296 + #{addflag2,jdbcType=NUMERIC},
297 + </if>
282 </trim> 298 </trim>
283 </insert> 299 </insert>
284 <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.UserExample" resultType="java.lang.Long"> 300 <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.UserExample" resultType="java.lang.Long">
...@@ -356,6 +372,12 @@ ...@@ -356,6 +372,12 @@
356 <if test="record.confirmPrompts != null"> 372 <if test="record.confirmPrompts != null">
357 CONFIRM_PROMPTS = #{record.confirmPrompts,jdbcType=NUMERIC}, 373 CONFIRM_PROMPTS = #{record.confirmPrompts,jdbcType=NUMERIC},
358 </if> 374 </if>
375 + <if test="record.addflag1 != null">
376 + addflag1 = #{record.addflag1,jdbcType=NUMERIC},
377 + </if>
378 + <if test="record.addflag2 != null">
379 + addflag2 = #{record.addflag2,jdbcType=NUMERIC},
380 + </if>
359 </set> 381 </set>
360 <if test="_parameter != null"> 382 <if test="_parameter != null">
361 <include refid="Update_By_Example_Where_Clause" /> 383 <include refid="Update_By_Example_Where_Clause" />
...@@ -384,7 +406,9 @@ ...@@ -384,7 +406,9 @@
384 MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP}, 406 MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP},
385 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC}, 407 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
386 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR}, 408 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
387 - CONFIRM_PROMPTS = #{record.confirmPrompts,jdbcType=NUMERIC} 409 + CONFIRM_PROMPTS = #{record.confirmPrompts,jdbcType=NUMERIC},
410 + addflag1 = #{record.addflag1,jdbcType=NUMERIC},
411 + addflag2 = #{record.addflag2,jdbcType=NUMERIC}
388 <if test="_parameter != null"> 412 <if test="_parameter != null">
389 <include refid="Update_By_Example_Where_Clause" /> 413 <include refid="Update_By_Example_Where_Clause" />
390 </if> 414 </if>
...@@ -455,6 +479,12 @@ ...@@ -455,6 +479,12 @@
455 <if test="confirmPrompts != null"> 479 <if test="confirmPrompts != null">
456 CONFIRM_PROMPTS = #{confirmPrompts,jdbcType=NUMERIC}, 480 CONFIRM_PROMPTS = #{confirmPrompts,jdbcType=NUMERIC},
457 </if> 481 </if>
482 + <if test="addflag1 != null">
483 + addflag1 = #{addflag1,jdbcType=NUMERIC},
484 + </if>
485 + <if test="addflag2 != null">
486 + addflag2 = #{addflag2,jdbcType=NUMERIC},
487 + </if>
458 </set> 488 </set>
459 where ID = #{id,jdbcType=NUMERIC} 489 where ID = #{id,jdbcType=NUMERIC}
460 </update> 490 </update>
...@@ -480,7 +510,9 @@ ...@@ -480,7 +510,9 @@
480 MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP}, 510 MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
481 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC}, 511 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
482 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR}, 512 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
483 - CONFIRM_PROMPTS = #{confirmPrompts,jdbcType=NUMERIC} 513 + CONFIRM_PROMPTS = #{confirmPrompts,jdbcType=NUMERIC},
514 + addflag1 = #{addflag1,jdbcType=NUMERIC},
515 + addflag2 = #{addflag2,jdbcType=NUMERIC}
484 where ID = #{id,jdbcType=NUMERIC} 516 where ID = #{id,jdbcType=NUMERIC}
485 </update> 517 </update>
486 <sql id="OracleDialectPrefix"> 518 <sql id="OracleDialectPrefix">
......
...@@ -119,6 +119,16 @@ public class User implements Serializable { ...@@ -119,6 +119,16 @@ public class User implements Serializable {
119 */ 119 */
120 private Long confirmPrompts; 120 private Long confirmPrompts;
121 121
122 + /**
123 + * ADD时弹出提示1
124 + */
125 + private Integer addflag1;
126 +
127 + /**
128 + * ADD时弹出提示2
129 + */
130 + private Integer addflag2;
131 +
122 private static final long serialVersionUID = 1L; 132 private static final long serialVersionUID = 1L;
123 133
124 public Long getId() { 134 public Long getId() {
...@@ -297,6 +307,22 @@ public class User implements Serializable { ...@@ -297,6 +307,22 @@ public class User implements Serializable {
297 this.confirmPrompts = confirmPrompts; 307 this.confirmPrompts = confirmPrompts;
298 } 308 }
299 309
310 + public Integer getAddflag1() {
311 + return addflag1;
312 + }
313 +
314 + public void setAddflag1(Integer addflag1) {
315 + this.addflag1 = addflag1;
316 + }
317 +
318 + public Integer getAddflag2() {
319 + return addflag2;
320 + }
321 +
322 + public void setAddflag2(Integer addflag2) {
323 + this.addflag2 = addflag2;
324 + }
325 +
300 @Override 326 @Override
301 public String toString() { 327 public String toString() {
302 StringBuilder sb = new StringBuilder(); 328 StringBuilder sb = new StringBuilder();
...@@ -325,6 +351,8 @@ public class User implements Serializable { ...@@ -325,6 +351,8 @@ public class User implements Serializable {
325 sb.append(", modifyUserId=").append(modifyUserId); 351 sb.append(", modifyUserId=").append(modifyUserId);
326 sb.append(", modifyUserName=").append(modifyUserName); 352 sb.append(", modifyUserName=").append(modifyUserName);
327 sb.append(", confirmPrompts=").append(confirmPrompts); 353 sb.append(", confirmPrompts=").append(confirmPrompts);
354 + sb.append(", addflag1=").append(addflag1);
355 + sb.append(", addflag2=").append(addflag2);
328 sb.append(", serialVersionUID=").append(serialVersionUID); 356 sb.append(", serialVersionUID=").append(serialVersionUID);
329 sb.append("]"); 357 sb.append("]");
330 return sb.toString(); 358 return sb.toString();
......
...@@ -1594,6 +1594,126 @@ public class UserExample { ...@@ -1594,6 +1594,126 @@ public class UserExample {
1594 addCriterion("CONFIRM_PROMPTS not between", value1, value2, "confirmPrompts"); 1594 addCriterion("CONFIRM_PROMPTS not between", value1, value2, "confirmPrompts");
1595 return (Criteria) this; 1595 return (Criteria) this;
1596 } 1596 }
1597 +
1598 + public Criteria andAddflag1IsNull() {
1599 + addCriterion("addflag1 is null");
1600 + return (Criteria) this;
1601 + }
1602 +
1603 + public Criteria andAddflag1IsNotNull() {
1604 + addCriterion("addflag1 is not null");
1605 + return (Criteria) this;
1606 + }
1607 +
1608 + public Criteria andAddflag1EqualTo(Long value) {
1609 + addCriterion("addflag1 =", value, "addflag1");
1610 + return (Criteria) this;
1611 + }
1612 +
1613 + public Criteria andAddflag1NotEqualTo(Long value) {
1614 + addCriterion("addflag1 <>", value, "addflag1");
1615 + return (Criteria) this;
1616 + }
1617 +
1618 + public Criteria andAddflag1GreaterThan(Long value) {
1619 + addCriterion("addflag1 >", value, "addflag1");
1620 + return (Criteria) this;
1621 + }
1622 +
1623 + public Criteria andAddflag1GreaterThanOrEqualTo(Long value) {
1624 + addCriterion("addflag1 >=", value, "addflag1");
1625 + return (Criteria) this;
1626 + }
1627 +
1628 + public Criteria andAddflag1LessThan(Long value) {
1629 + addCriterion("addflag1 <", value, "addflag1");
1630 + return (Criteria) this;
1631 + }
1632 +
1633 + public Criteria andAddflag1LessThanOrEqualTo(Long value) {
1634 + addCriterion("addflag1 <=", value, "addflag1");
1635 + return (Criteria) this;
1636 + }
1637 +
1638 + public Criteria andAddflag1In(List<Long> values) {
1639 + addCriterion("addflag1 in", values, "addflag1");
1640 + return (Criteria) this;
1641 + }
1642 +
1643 + public Criteria andAddflag1NotIn(List<Long> values) {
1644 + addCriterion("addflag1 not in", values, "addflag1");
1645 + return (Criteria) this;
1646 + }
1647 +
1648 + public Criteria andAddflag1Between(Long value1, Long value2) {
1649 + addCriterion("addflag1 between", value1, value2, "addflag1");
1650 + return (Criteria) this;
1651 + }
1652 +
1653 + public Criteria andAddflag1NotBetween(Long value1, Long value2) {
1654 + addCriterion("addflag1 not between", value1, value2, "addflag1");
1655 + return (Criteria) this;
1656 + }
1657 +
1658 + public Criteria andAddflag2IsNull() {
1659 + addCriterion("addflag2 is null");
1660 + return (Criteria) this;
1661 + }
1662 +
1663 + public Criteria andAddflag2IsNotNull() {
1664 + addCriterion("addflag2 is not null");
1665 + return (Criteria) this;
1666 + }
1667 +
1668 + public Criteria andAddflag2EqualTo(Long value) {
1669 + addCriterion("addflag2 =", value, "addflag2");
1670 + return (Criteria) this;
1671 + }
1672 +
1673 + public Criteria andAddflag2NotEqualTo(Long value) {
1674 + addCriterion("addflag2 <>", value, "addflag2");
1675 + return (Criteria) this;
1676 + }
1677 +
1678 + public Criteria andAddflag2GreaterThan(Long value) {
1679 + addCriterion("addflag2 >", value, "addflag2");
1680 + return (Criteria) this;
1681 + }
1682 +
1683 + public Criteria andAddflag2GreaterThanOrEqualTo(Long value) {
1684 + addCriterion("addflag2 >=", value, "addflag2");
1685 + return (Criteria) this;
1686 + }
1687 +
1688 + public Criteria andAddflag2LessThan(Long value) {
1689 + addCriterion("addflag2 <", value, "addflag2");
1690 + return (Criteria) this;
1691 + }
1692 +
1693 + public Criteria andAddflag2LessThanOrEqualTo(Long value) {
1694 + addCriterion("addflag2 <=", value, "addflag2");
1695 + return (Criteria) this;
1696 + }
1697 +
1698 + public Criteria andAddflag2In(List<Long> values) {
1699 + addCriterion("addflag2 in", values, "addflag2");
1700 + return (Criteria) this;
1701 + }
1702 +
1703 + public Criteria andAddflag2NotIn(List<Long> values) {
1704 + addCriterion("addflag2 not in", values, "addflag2");
1705 + return (Criteria) this;
1706 + }
1707 +
1708 + public Criteria andAddflag2Between(Long value1, Long value2) {
1709 + addCriterion("addflag2 between", value1, value2, "addflag2");
1710 + return (Criteria) this;
1711 + }
1712 +
1713 + public Criteria andAddflag2NotBetween(Long value1, Long value2) {
1714 + addCriterion("addflag2 not between", value1, value2, "addflag2");
1715 + return (Criteria) this;
1716 + }
1597 } 1717 }
1598 1718
1599 public static class Criteria extends GeneratedCriteria { 1719 public static class Criteria extends GeneratedCriteria {
......
...@@ -193,12 +193,12 @@ ...@@ -193,12 +193,12 @@
193 <!-- selectByExampleQueryId="true">--> 193 <!-- selectByExampleQueryId="true">-->
194 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_ROLE_PRIVILEGE.NEXTVAL FROM DUAL" />--> 194 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_ROLE_PRIVILEGE.NEXTVAL FROM DUAL" />-->
195 <!-- </table>--> 195 <!-- </table>-->
196 -<!-- <table schema="ICLEARIMP" tableName="T_SYS_USER" domainObjectName="User"--> 196 + <table schema="ICLEARIMP" tableName="T_SYS_USER" domainObjectName="User"
197 -<!-- enableCountByExample="true" enableUpdateByExample="true"--> 197 + enableCountByExample="true" enableUpdateByExample="true"
198 -<!-- enableDeleteByExample="true" enableSelectByExample="true"--> 198 + enableDeleteByExample="true" enableSelectByExample="true"
199 -<!-- selectByExampleQueryId="true">--> 199 + selectByExampleQueryId="true">
200 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL" />--> 200 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL" />
201 -<!-- </table>--> 201 + </table>
202 <!-- <table schema="ICLEARIMP" tableName="T_SYS_USER_ROLE" domainObjectName="UserRole"--> 202 <!-- <table schema="ICLEARIMP" tableName="T_SYS_USER_ROLE" domainObjectName="UserRole"-->
203 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 203 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
204 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 204 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
......
...@@ -25,7 +25,9 @@ public interface ParamConfigConstants { ...@@ -25,7 +25,9 @@ public interface ParamConfigConstants {
25 String PUSH_IMP001_INTERVAL = "push_imp001_interval"; 25 String PUSH_IMP001_INTERVAL = "push_imp001_interval";
26 //推送进口文件定时任务处理数量 26 //推送进口文件定时任务处理数量
27 String PUSH_CON_NUMBER = "push_con_number"; 27 String PUSH_CON_NUMBER = "push_con_number";
28 - // 28 + //通知发件人定时任务处理数量
29 String NOTIFICATION_SENDER_NUMBER = "notification_sender_number"; 29 String NOTIFICATION_SENDER_NUMBER = "notification_sender_number";
30 + //通知发件人邮件定时任务处理数量
31 + String NOTIFICATION_SENDER_EMAIL_NUMBER = "notification_sender_email_number";
30 } 32 }
31 } 33 }
......
1 package com.fedex.connect.manager.controller.sys; 1 package com.fedex.connect.manager.controller.sys;
2 2
3 import com.fedex.connect.common.dependencies.date.vo.ResponseVo; 3 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
4 +import com.fedex.connect.manager.data.bo.AddFlagBo;
4 5
5 public interface ISysUserController { 6 public interface ISysUserController {
6 ResponseVo getUser(); 7 ResponseVo getUser();
8 +
9 + ResponseVo updateAddFlag(AddFlagBo bo);
7 } 10 }
......
...@@ -5,13 +5,12 @@ import com.fedex.connect.common.dependencies.util.CurrentUserInfo; ...@@ -5,13 +5,12 @@ import com.fedex.connect.common.dependencies.util.CurrentUserInfo;
5 import com.fedex.connect.common.model.sys.User; 5 import com.fedex.connect.common.model.sys.User;
6 import com.fedex.connect.manager.controller.base.BaseController; 6 import com.fedex.connect.manager.controller.base.BaseController;
7 import com.fedex.connect.manager.controller.sys.ISysUserController; 7 import com.fedex.connect.manager.controller.sys.ISysUserController;
8 +import com.fedex.connect.manager.data.bo.AddFlagBo;
8 import com.fedex.connect.manager.enums.ResponseCode; 9 import com.fedex.connect.manager.enums.ResponseCode;
9 import io.swagger.annotations.Api; 10 import io.swagger.annotations.Api;
10 import io.swagger.annotations.ApiOperation; 11 import io.swagger.annotations.ApiOperation;
11 import lombok.extern.slf4j.Slf4j; 12 import lombok.extern.slf4j.Slf4j;
12 -import org.springframework.web.bind.annotation.GetMapping; 13 +import org.springframework.web.bind.annotation.*;
13 -import org.springframework.web.bind.annotation.RequestMapping;
14 -import org.springframework.web.bind.annotation.RestController;
15 14
16 @Slf4j 15 @Slf4j
17 @RestController 16 @RestController
...@@ -41,4 +40,24 @@ public class SysUserController extends BaseController implements ISysUserControl ...@@ -41,4 +40,24 @@ public class SysUserController extends BaseController implements ISysUserControl
41 } 40 }
42 return success; 41 return success;
43 } 42 }
43 +
44 + @Override
45 + @PostMapping("/updateAddFlag")
46 + @ApiOperation(value = "更新ADD标记")
47 + public ResponseVo updateAddFlag(@RequestBody AddFlagBo bo){
48 + ResponseVo success = responseUtils.success();
49 + try{
50 + User sysUser = this.getCurrentUserInfo();
51 + /**
52 + * 更新ADD标记
53 + */
54 + sysUserService.updateAddFlag(sysUser,bo);
55 + //返回用户信息
56 + return responseUtils.success(sysUser);
57 + } catch (Exception e){
58 + log.error("获取用户信息失败",e);
59 + responseUtils.fail(ResponseCode.MESSAGE_CODE_40006);
60 + }
61 + return success;
62 + }
44 } 63 }
......
1 +package com.fedex.connect.manager.data.bo;
2 +
3 +import lombok.Data;
4 +
5 +@Data
6 +public class AddFlagBo {
7 + private Integer addFlag1;
8 + private Integer addFlag2;
9 +}
1 package com.fedex.connect.manager.service.sys; 1 package com.fedex.connect.manager.service.sys;
2 2
3 import com.fedex.connect.common.model.sys.User; 3 import com.fedex.connect.common.model.sys.User;
4 +import com.fedex.connect.manager.data.bo.AddFlagBo;
4 import com.fedex.connect.manager.data.dto.SysUserDto; 5 import com.fedex.connect.manager.data.dto.SysUserDto;
5 6
6 import javax.servlet.http.HttpServletRequest; 7 import javax.servlet.http.HttpServletRequest;
...@@ -16,4 +17,6 @@ public interface ISysUserService { ...@@ -16,4 +17,6 @@ public interface ISysUserService {
16 void getFclData(HttpServletRequest request,List<String> cookiesList,List<String> saveKeyList); 17 void getFclData(HttpServletRequest request,List<String> cookiesList,List<String> saveKeyList);
17 18
18 User findById(Long id); 19 User findById(Long id);
20 +
21 + void updateAddFlag(User user, AddFlagBo bo);
19 } 22 }
......
...@@ -11,6 +11,7 @@ import com.fedex.connect.common.model.sys.Role; ...@@ -11,6 +11,7 @@ import com.fedex.connect.common.model.sys.Role;
11 import com.fedex.connect.common.model.sys.User; 11 import com.fedex.connect.common.model.sys.User;
12 import com.fedex.connect.common.model.sys.UserExample; 12 import com.fedex.connect.common.model.sys.UserExample;
13 import com.fedex.connect.manager.config.PropertiesConfig; 13 import com.fedex.connect.manager.config.PropertiesConfig;
14 +import com.fedex.connect.manager.data.bo.AddFlagBo;
14 import com.fedex.connect.manager.data.dto.SysUserDto; 15 import com.fedex.connect.manager.data.dto.SysUserDto;
15 import com.fedex.connect.manager.data.model.LogShowModel; 16 import com.fedex.connect.manager.data.model.LogShowModel;
16 import com.fedex.connect.manager.service.base.BaseService; 17 import com.fedex.connect.manager.service.base.BaseService;
...@@ -195,5 +196,26 @@ public class SysUserServiceImpl extends BaseService implements ISysUserService { ...@@ -195,5 +196,26 @@ public class SysUserServiceImpl extends BaseService implements ISysUserService {
195 return userRepository.findById(id); 196 return userRepository.findById(id);
196 } 197 }
197 198
199 + /**
200 + * @Author Szl
201 + * @Description 功能说明 更新用户ADD提示标记
202 + * @Date 2024/11/20
203 + * @param user
204 + * @param bo
205 + * @return void
206 + */
207 + @Override
208 + public void updateAddFlag(User user, AddFlagBo bo) {
209 + if (bo.getAddFlag1() != null){
210 + user.setAddflag1(bo.getAddFlag1());
211 + }
212 +
213 + if (bo.getAddFlag2() != null){
214 + user.setAddflag2(bo.getAddFlag2());
215 + }
216 +
217 + userRepository.updateByPrimaryKeySelective(user);
218 + }
219 +
198 220
199 } 221 }
......
...@@ -38,7 +38,7 @@ public class DuplicateConsignmentEmailServiceImpl extends BaseService implements ...@@ -38,7 +38,7 @@ public class DuplicateConsignmentEmailServiceImpl extends BaseService implements
38 * 查询邮件发送日志表中状态为待推送且类型为“提醒发件人”的数据 38 * 查询邮件发送日志表中状态为待推送且类型为“提醒发件人”的数据
39 */ 39 */
40 List<Email> emails = iEmailExtRepository.findEmailsByDic(cacheSystem.getDicEmailType(EmailTypeEnum.NOTIFICATION_SENDER.getEnMsg()).getCode(), 40 List<Email> emails = iEmailExtRepository.findEmailsByDic(cacheSystem.getDicEmailType(EmailTypeEnum.NOTIFICATION_SENDER.getEnMsg()).getCode(),
41 - cacheSystem.getDicEmailStatus(EmailStatusEnum.PENDING.getEnMsg()).getCode(), ParamConfigConstants.TASK_PARAM_KEYS.NOTIFICATION_SENDER_NUMBER); 41 + cacheSystem.getDicEmailStatus(EmailStatusEnum.PENDING.getEnMsg()).getCode(), ParamConfigConstants.TASK_PARAM_KEYS.NOTIFICATION_SENDER_EMAIL_NUMBER);
42 /** 42 /**
43 * 发送邮件 43 * 发送邮件
44 */ 44 */
......
...@@ -91,12 +91,12 @@ public class DuplicateEmailUtil { ...@@ -91,12 +91,12 @@ public class DuplicateEmailUtil {
91 @Transactional 91 @Transactional
92 public void saveEmail(Email email){ 92 public void saveEmail(Email email){
93 if (EmailStatusEnum.PENDING.getCode().equals(email.getTypeCode())){ 93 if (EmailStatusEnum.PENDING.getCode().equals(email.getTypeCode())){
94 - emailRepository.save(email); 94 + emailRepository.saveOrUpdate(email);
95 }else { 95 }else {
96 EmailHistory emailHistory = new EmailHistory(); 96 EmailHistory emailHistory = new EmailHistory();
97 BeanUtils.copyProperties(email, emailHistory); 97 BeanUtils.copyProperties(email, emailHistory);
98 emailRepository.deleteById(email.getId()); 98 emailRepository.deleteById(email.getId());
99 - emailHistoryRepository.save(emailHistory); 99 + emailHistoryRepository.saveOrUpdate(emailHistory);
100 } 100 }
101 } 101 }
102 } 102 }
......
...@@ -58,7 +58,7 @@ public class KafkaDmUtil { ...@@ -58,7 +58,7 @@ public class KafkaDmUtil {
58 //kafka临时表转历史表，并且将临时表id置空 58 //kafka临时表转历史表，并且将临时表id置空
59 List<KafkaStorageHistory> kafKaStorageHistoryList = this.convertTempToHis(backHisList); 59 List<KafkaStorageHistory> kafKaStorageHistoryList = this.convertTempToHis(backHisList);
60 //保存至历史表 60 //保存至历史表
61 - kafkaStorageHistoryRepository.saveAll(kafKaStorageHistoryList); 61 + kafkaStorageHistoryRepository.saveOrUpdateAll(kafKaStorageHistoryList);
62 } 62 }
63 /***更新临时表状态，并实体数据转换为json字符串进行数据下发***/ 63 /***更新临时表状态，并实体数据转换为json字符串进行数据下发***/
64 if(issuedList.size() > 0) { 64 if(issuedList.size() > 0) {
......