task|阈值添加

@@ -24,6 +24,8 @@
     <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
     <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
     <result column="CONFIRM_PROMPTS" jdbcType="NUMERIC" property="confirmPrompts" />
+    <result column="addflag1" jdbcType="NUMERIC" property="addflag1" />
+    <result column="addflag2" jdbcType="NUMERIC" property="addflag2" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -87,7 +89,7 @@
     ID, LOGIN_NAME, USER_NAME, PASSWORD, USER_UUID, EMAIL, PHONE, COMPANY_NAME, ACCOUNT_NO, 
     UNIFIED_BUSINESS_NUM, CUSTOMS_SERIAL_NUM, TYPE_CODE, TYPE_NAME, STATUS, REMARK, CREATE_TIME, 
     CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, 
-    CONFIRM_PROMPTS
+    CONFIRM_PROMPTS, addflag1, addflag2
   </sql>
   <select id="selectByExample" parameterType="com.fedex.connect.common.model.sys.UserExample" resultMap="BaseResultMap">
     <include refid="OracleDialectPrefix" />
@@ -133,7 +135,8 @@
       TYPE_NAME, STATUS, REMARK, 
       CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 
       MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, 
-      CONFIRM_PROMPTS)
+      CONFIRM_PROMPTS, addflag1, addflag2
+      )
     values (#{id,jdbcType=NUMERIC}, #{loginName,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, 
       #{password,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, 
       #{phone,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{accountNo,jdbcType=VARCHAR}, 
@@ -141,7 +144,8 @@
       #{typeName,jdbcType=VARCHAR}, #{status,jdbcType=NUMERIC}, #{remark,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, 
       #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}, 
-      #{confirmPrompts,jdbcType=NUMERIC})
+      #{confirmPrompts,jdbcType=NUMERIC}, #{addflag1,jdbcType=NUMERIC}, #{addflag2,jdbcType=NUMERIC}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.fedex.connect.common.model.sys.User">
     <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
@@ -213,6 +217,12 @@
       <if test="confirmPrompts != null">
         CONFIRM_PROMPTS,
       </if>
+      <if test="addflag1 != null">
+        addflag1,
+      </if>
+      <if test="addflag2 != null">
+        addflag2,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       #{id,jdbcType=NUMERIC},
@@ -279,6 +289,12 @@
       <if test="confirmPrompts != null">
         #{confirmPrompts,jdbcType=NUMERIC},
       </if>
+      <if test="addflag1 != null">
+        #{addflag1,jdbcType=NUMERIC},
+      </if>
+      <if test="addflag2 != null">
+        #{addflag2,jdbcType=NUMERIC},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.UserExample" resultType="java.lang.Long">
@@ -356,6 +372,12 @@
       <if test="record.confirmPrompts != null">
         CONFIRM_PROMPTS = #{record.confirmPrompts,jdbcType=NUMERIC},
       </if>
+      <if test="record.addflag1 != null">
+        addflag1 = #{record.addflag1,jdbcType=NUMERIC},
+      </if>
+      <if test="record.addflag2 != null">
+        addflag2 = #{record.addflag2,jdbcType=NUMERIC},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -384,7 +406,9 @@
       MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP},
       MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
       MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
-      CONFIRM_PROMPTS = #{record.confirmPrompts,jdbcType=NUMERIC}
+      CONFIRM_PROMPTS = #{record.confirmPrompts,jdbcType=NUMERIC},
+      addflag1 = #{record.addflag1,jdbcType=NUMERIC},
+      addflag2 = #{record.addflag2,jdbcType=NUMERIC}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -455,6 +479,12 @@
       <if test="confirmPrompts != null">
         CONFIRM_PROMPTS = #{confirmPrompts,jdbcType=NUMERIC},
       </if>
+      <if test="addflag1 != null">
+        addflag1 = #{addflag1,jdbcType=NUMERIC},
+      </if>
+      <if test="addflag2 != null">
+        addflag2 = #{addflag2,jdbcType=NUMERIC},
+      </if>
     </set>
     where ID = #{id,jdbcType=NUMERIC}
   </update>
@@ -480,7 +510,9 @@
       MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
       MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
       MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
-      CONFIRM_PROMPTS = #{confirmPrompts,jdbcType=NUMERIC}
+      CONFIRM_PROMPTS = #{confirmPrompts,jdbcType=NUMERIC},
+      addflag1 = #{addflag1,jdbcType=NUMERIC},
+      addflag2 = #{addflag2,jdbcType=NUMERIC}
     where ID = #{id,jdbcType=NUMERIC}
   </update>
   <sql id="OracleDialectPrefix">

@@ -119,6 +119,16 @@ public class User implements Serializable {
      */
     private Long confirmPrompts;
 
+    /**
+     * ADD时弹出提示1
+     */
+    private Integer addflag1;
+
+    /**
+     * ADD时弹出提示2
+     */
+    private Integer addflag2;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -297,6 +307,22 @@ public class User implements Serializable {
         this.confirmPrompts = confirmPrompts;
     }
 
+    public Integer getAddflag1() {
+        return addflag1;
+    }
+
+    public void setAddflag1(Integer addflag1) {
+        this.addflag1 = addflag1;
+    }
+
+    public Integer getAddflag2() {
+        return addflag2;
+    }
+
+    public void setAddflag2(Integer addflag2) {
+        this.addflag2 = addflag2;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -325,6 +351,8 @@ public class User implements Serializable {
         sb.append(", modifyUserId=").append(modifyUserId);
         sb.append(", modifyUserName=").append(modifyUserName);
         sb.append(", confirmPrompts=").append(confirmPrompts);
+        sb.append(", addflag1=").append(addflag1);
+        sb.append(", addflag2=").append(addflag2);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

@@ -1594,6 +1594,126 @@ public class UserExample {
             addCriterion("CONFIRM_PROMPTS not between", value1, value2, "confirmPrompts");
             return (Criteria) this;
         }
+
+        public Criteria andAddflag1IsNull() {
+            addCriterion("addflag1 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag1IsNotNull() {
+            addCriterion("addflag1 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag1EqualTo(Long value) {
+            addCriterion("addflag1 =", value, "addflag1");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag1NotEqualTo(Long value) {
+            addCriterion("addflag1 <>", value, "addflag1");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag1GreaterThan(Long value) {
+            addCriterion("addflag1 >", value, "addflag1");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag1GreaterThanOrEqualTo(Long value) {
+            addCriterion("addflag1 >=", value, "addflag1");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag1LessThan(Long value) {
+            addCriterion("addflag1 <", value, "addflag1");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag1LessThanOrEqualTo(Long value) {
+            addCriterion("addflag1 <=", value, "addflag1");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag1In(List<Long> values) {
+            addCriterion("addflag1 in", values, "addflag1");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag1NotIn(List<Long> values) {
+            addCriterion("addflag1 not in", values, "addflag1");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag1Between(Long value1, Long value2) {
+            addCriterion("addflag1 between", value1, value2, "addflag1");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag1NotBetween(Long value1, Long value2) {
+            addCriterion("addflag1 not between", value1, value2, "addflag1");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag2IsNull() {
+            addCriterion("addflag2 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag2IsNotNull() {
+            addCriterion("addflag2 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag2EqualTo(Long value) {
+            addCriterion("addflag2 =", value, "addflag2");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag2NotEqualTo(Long value) {
+            addCriterion("addflag2 <>", value, "addflag2");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag2GreaterThan(Long value) {
+            addCriterion("addflag2 >", value, "addflag2");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag2GreaterThanOrEqualTo(Long value) {
+            addCriterion("addflag2 >=", value, "addflag2");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag2LessThan(Long value) {
+            addCriterion("addflag2 <", value, "addflag2");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag2LessThanOrEqualTo(Long value) {
+            addCriterion("addflag2 <=", value, "addflag2");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag2In(List<Long> values) {
+            addCriterion("addflag2 in", values, "addflag2");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag2NotIn(List<Long> values) {
+            addCriterion("addflag2 not in", values, "addflag2");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag2Between(Long value1, Long value2) {
+            addCriterion("addflag2 between", value1, value2, "addflag2");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddflag2NotBetween(Long value1, Long value2) {
+            addCriterion("addflag2 not between", value1, value2, "addflag2");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

@@ -193,12 +193,12 @@
 <!--               selectByExampleQueryId="true">-->
 <!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_ROLE_PRIVILEGE.NEXTVAL FROM DUAL" />-->
 <!--        </table>-->
-<!--        <table schema="ICLEARIMP" tableName="T_SYS_USER" domainObjectName="User"-->
-<!--               enableCountByExample="true" enableUpdateByExample="true"-->
-<!--               enableDeleteByExample="true" enableSelectByExample="true"-->
-<!--               selectByExampleQueryId="true">-->
-<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL" />-->
-<!--        </table>-->
+        <table schema="ICLEARIMP" tableName="T_SYS_USER" domainObjectName="User"
+               enableCountByExample="true" enableUpdateByExample="true"
+               enableDeleteByExample="true" enableSelectByExample="true"
+               selectByExampleQueryId="true">
+            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL" />
+        </table>
 <!--        <table schema="ICLEARIMP" tableName="T_SYS_USER_ROLE" domainObjectName="UserRole"-->
 <!--               enableCountByExample="true" enableUpdateByExample="true"-->
 <!--               enableDeleteByExample="true" enableSelectByExample="true"-->

@@ -25,7 +25,9 @@ public interface ParamConfigConstants {
         String PUSH_IMP001_INTERVAL = "push_imp001_interval";
         //推送进口文件定时任务处理数量
         String PUSH_CON_NUMBER = "push_con_number";
-        //
+        //通知发件人定时任务处理数量
         String NOTIFICATION_SENDER_NUMBER = "notification_sender_number";
+        //通知发件人邮件定时任务处理数量
+        String NOTIFICATION_SENDER_EMAIL_NUMBER = "notification_sender_email_number";
     }
 }

 package com.fedex.connect.manager.controller.sys;
 
 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
+import com.fedex.connect.manager.data.bo.AddFlagBo;
 
 public interface ISysUserController {
     ResponseVo getUser();
+
+    ResponseVo updateAddFlag(AddFlagBo bo);
 }

@@ -5,13 +5,12 @@ import com.fedex.connect.common.dependencies.util.CurrentUserInfo;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.manager.controller.base.BaseController;
 import com.fedex.connect.manager.controller.sys.ISysUserController;
+import com.fedex.connect.manager.data.bo.AddFlagBo;
 import com.fedex.connect.manager.enums.ResponseCode;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @Slf4j
 @RestController
@@ -41,4 +40,24 @@ public class SysUserController extends BaseController implements ISysUserControl
         }
         return success;
     }
+
+    @Override
+    @PostMapping("/updateAddFlag")
+    @ApiOperation(value = "更新ADD标记")
+    public ResponseVo updateAddFlag(@RequestBody AddFlagBo bo){
+        ResponseVo success = responseUtils.success();
+        try{
+            User sysUser = this.getCurrentUserInfo();
+            /**
+             * 更新ADD标记
+             */
+            sysUserService.updateAddFlag(sysUser,bo);
+            //返回用户信息
+            return responseUtils.success(sysUser);
+        } catch (Exception e){
+            log.error("获取用户信息失败",e);
+            responseUtils.fail(ResponseCode.MESSAGE_CODE_40006);
+        }
+        return success;
+    }
 }

+package com.fedex.connect.manager.data.bo;
+
+import lombok.Data;
+
+@Data
+public class AddFlagBo {
+    private Integer addFlag1;
+    private Integer addFlag2;
+}

 package com.fedex.connect.manager.service.sys;
 
 import com.fedex.connect.common.model.sys.User;
+import com.fedex.connect.manager.data.bo.AddFlagBo;
 import com.fedex.connect.manager.data.dto.SysUserDto;
 
 import javax.servlet.http.HttpServletRequest;
@@ -16,4 +17,6 @@ public interface ISysUserService {
     void getFclData(HttpServletRequest request,List<String> cookiesList,List<String> saveKeyList);
 
     User findById(Long id);
+
+    void updateAddFlag(User user, AddFlagBo bo);
 }

@@ -11,6 +11,7 @@ import com.fedex.connect.common.model.sys.Role;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.common.model.sys.UserExample;
 import com.fedex.connect.manager.config.PropertiesConfig;
+import com.fedex.connect.manager.data.bo.AddFlagBo;
 import com.fedex.connect.manager.data.dto.SysUserDto;
 import com.fedex.connect.manager.data.model.LogShowModel;
 import com.fedex.connect.manager.service.base.BaseService;
@@ -195,5 +196,26 @@ public class SysUserServiceImpl extends BaseService implements ISysUserService {
         return userRepository.findById(id);
     }
 
+    /**
+      * @Author Szl
+      * @Description 功能说明 更新用户ADD提示标记
+      * @Date 2024/11/20
+      * @param user
+      * @param bo
+      * @return void
+      */
+    @Override
+    public void updateAddFlag(User user, AddFlagBo bo) {
+        if (bo.getAddFlag1() != null){
+            user.setAddflag1(bo.getAddFlag1());
+        }
+
+        if (bo.getAddFlag2() != null){
+            user.setAddflag2(bo.getAddFlag2());
+        }
+
+        userRepository.updateByPrimaryKeySelective(user);
+    }
+
 
 }

@@ -38,7 +38,7 @@ public class DuplicateConsignmentEmailServiceImpl extends BaseService implements
          *  查询邮件发送日志表中状态为待推送且类型为“提醒发件人”的数据
          */
         List<Email> emails = iEmailExtRepository.findEmailsByDic(cacheSystem.getDicEmailType(EmailTypeEnum.NOTIFICATION_SENDER.getEnMsg()).getCode(),
-                cacheSystem.getDicEmailStatus(EmailStatusEnum.PENDING.getEnMsg()).getCode(), ParamConfigConstants.TASK_PARAM_KEYS.NOTIFICATION_SENDER_NUMBER);
+                cacheSystem.getDicEmailStatus(EmailStatusEnum.PENDING.getEnMsg()).getCode(), ParamConfigConstants.TASK_PARAM_KEYS.NOTIFICATION_SENDER_EMAIL_NUMBER);
         /**
          * 发送邮件
          */

@@ -91,12 +91,12 @@ public class DuplicateEmailUtil {
     @Transactional
     public void saveEmail(Email email){
         if (EmailStatusEnum.PENDING.getCode().equals(email.getTypeCode())){
-            emailRepository.save(email);
+            emailRepository.saveOrUpdate(email);
         }else {
             EmailHistory emailHistory = new EmailHistory();
             BeanUtils.copyProperties(email, emailHistory);
             emailRepository.deleteById(email.getId());
-            emailHistoryRepository.save(emailHistory);
+            emailHistoryRepository.saveOrUpdate(emailHistory);
         }
     }
 }

@@ -58,7 +58,7 @@ public class KafkaDmUtil {
             //kafka临时表转历史表，并且将临时表id置空
             List<KafkaStorageHistory> kafKaStorageHistoryList = this.convertTempToHis(backHisList);
             //保存至历史表
-            kafkaStorageHistoryRepository.saveAll(kafKaStorageHistoryList);
+            kafkaStorageHistoryRepository.saveOrUpdateAll(kafKaStorageHistoryList);
         }
         /***更新临时表状态，并实体数据转换为json字符串进行数据下发***/
         if(issuedList.size() > 0) {