问题修复

coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java

@@ -12,7 +12,7 @@ public class CommonConstants {
 
     public static final String MESSAGE_ID = "messageId";
 
-    public static final String ACCESS_TOKEN_KEY = "access_token";
+    public static final String ACCESS_TOKEN_KEY = "access_token:{0}";
 
     public static final String REFRESH_TOKEN_KEY = "refresh_token";
 

coolstore-partner-dao/src/main/java/com/cool/store/dao/HyInspectionSettingMappingDAO.java

@@ -48,6 +48,7 @@ public class HyInspectionSettingMappingDAO {
         if(CollectionUtils.isEmpty(openAreaMappingIds) || Objects.isNull(inspectionSettingId)){
             return CommonConstants.ZERO;
         }
+        hyInspectionSettingMappingMapper.deleteInOpenAreaMappingIds(inspectionSettingId, openAreaMappingIds);
         List<HyInspectionSettingMappingDO> insertList = new ArrayList<>();
         for (Long openAreaMappingId : openAreaMappingIds) {
             HyInspectionSettingMappingDO insert = new HyInspectionSettingMappingDO();

coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInspectionSettingMappingMapper.java

@@ -54,4 +54,12 @@ public interface HyInspectionSettingMappingMapper {
      * @return
      */
     List<HyInspectionSettingMappingDO> getConflictInspectionSetting(@Param("inspectionSettingId") Long inspectionSettingId, @Param("openAreaMappingIds") List<Long> openAreaMappingIds);
+
+    /**
+     * 删除
+     * @param excludeInspectionSettingId
+     * @param openAreaMappingIds
+     * @return
+     */
+    Integer deleteInOpenAreaMappingIds(@Param("excludeInspectionSettingId") Long excludeInspectionSettingId, @Param("openAreaMappingIds") List<Long> openAreaMappingIds);
 }

coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml

@@ -37,9 +37,6 @@
         <foreach collection="recordList" item="record" separator=";">
             insert into enterprise_user
             <trim prefix="(" suffix=")" suffixOverrides=",">
-                <if test="record.id != null">
-                    id,
-                </if>
                 <if test="record.userId != null">
                     user_id,
                 </if>
@@ -99,9 +96,6 @@
                 </if>
             </trim>
             <trim prefix="values (" suffix=")" suffixOverrides=",">
-                <if test="record.id != null">
-                    #{record.id},
-                </if>
                 <if test="record.userId != null">
                     #{record.userId},
                 </if>

coolstore-partner-dao/src/main/resources/mapper/HyInspectionSettingMappingMapper.xml

@@ -82,14 +82,14 @@
         update
             hy_inspection_setting_mapping
         set
-            deleted = '1' , update_time = new()
+            deleted = '1' , update_time = now()
         where
             inspection_setting_id = #{inspectionSettingId} and open_area_mapping_id not in
             <foreach collection="openAreaMappingIds" separator="," open="(" close=")" item="openAreaMappingId" >#{openAreaMappingId}</foreach>
     </update>
 
     <update id="deleteInspectionSettingMapping">
-        update hy_inspection_setting_mapping set deleted = '1' , update_time = new() where inspection_setting_id = #{inspectionSettingId}
+        update hy_inspection_setting_mapping set deleted = '1' , update_time = now() where inspection_setting_id = #{inspectionSettingId}
     </update>
     
     <select id="getConflictInspectionSetting" resultMap="BaseResultMap">
@@ -106,4 +106,16 @@
             and inspection_setting_id != #{inspectionSettingId}
         </if>
     </select>
+
+    <update id="deleteInOpenAreaMappingIds">
+        update
+            hy_inspection_setting_mapping
+        set
+            deleted = '1' , update_time = now()
+        where
+            open_area_mapping_id in <foreach collection="openAreaMappingIds" separator="," open="(" close=")" item="openAreaMappingId" >#{openAreaMappingId}</foreach>
+            <if test="excludeInspectionSettingId != null">
+                and inspection_setting_id != #{inspectionSettingId}
+            </if>
+    </update>
 </mapper>

coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml

@@ -11,9 +11,9 @@
         <result column="leader_user_id" jdbcType="VARCHAR" property="leaderUserId"/>
         <result column="order_num" jdbcType="INTEGER" property="orderNum"/>
         <result column="third_dept_id" jdbcType="VARCHAR" property="thirdDeptId"/>
-        <result column="create_time" jdbcType="BIGINT" property="createTime"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="create_name" jdbcType="VARCHAR" property="createName"/>
-        <result column="update_time" jdbcType="BIGINT" property="updateTime"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="update_name" jdbcType="VARCHAR" property="updateName"/>
         <result column="deleted" jdbcType="BIT" property="deleted"/>
     </resultMap>
@@ -106,7 +106,7 @@
                     #{record.deleted},
                 </if>
             </trim>
-          ON DUPLICATE KEY UPDATE region_id = values(region_id), name = values(name), parent_id = values(parent_id), region_path = values(region_path), leader_user_id = values(leader_user_id), order_num = values(order_num), third_dept_id = values(third_dept_id), update_time = UNIX_TIMESTAMP(), deleted = values(deleted)
+          ON DUPLICATE KEY UPDATE region_id = values(region_id), name = values(name), parent_id = values(parent_id), region_path = values(region_path), leader_user_id = values(leader_user_id), order_num = values(order_num), third_dept_id = values(third_dept_id), update_time = now(), deleted = values(deleted)
         </foreach>
     </insert>
     <update id="updateByPrimaryKeySelective">
@@ -156,7 +156,7 @@
     </update>
 
     <update id="deleteNotExistRegion">
-        update region set deleted = 1 , update_time = UNIX_TIMESTAMP() where region_id not in <foreach collection="regionIds" separator="," item="regionId" open="(" close=")"> #{regionId}</foreach>
+        update region set deleted = 1 , update_time = now() where region_id not in <foreach collection="regionIds" separator="," item="regionId" open="(" close=")"> #{regionId}</foreach>
     </update>
     
     <select id="getRegionByRegionIds" resultMap="BaseResultMap">

coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/EnterpriseUserDTO.java

@@ -34,7 +34,7 @@ public class EnterpriseUserDTO implements Serializable {
     private String remark;
 
     @ApiModelProperty("用户主键id")
-    private String id;
+    private Long id;
 
     @ApiModelProperty("钉钉用户id")
     private String userId;
@@ -106,7 +106,6 @@ public class EnterpriseUserDTO implements Serializable {
         List<EnterpriseUserDO> resultList = new ArrayList<>();
         for (EnterpriseUserDTO user : userList) {
             EnterpriseUserDO enterpriseUserDO = new EnterpriseUserDO();
-            enterpriseUserDO.setId(UUIDUtils.get32UUID());
             enterpriseUserDO.setUserId(user.getUserId());
             enterpriseUserDO.setName(user.getName());
             enterpriseUserDO.setRemark(user.getRemark());
@@ -155,7 +154,6 @@ public class EnterpriseUserDTO implements Serializable {
 
     public static EnterpriseUserDO transUserDtoToDo(EnterpriseUserDTO user, Map<String, String> regionPathMap, Multimap<String, String> leaderDeptMap, FSEventTypeEnum eventType) {
         EnterpriseUserDO enterpriseUserDO = new EnterpriseUserDO();
-        enterpriseUserDO.setId(UUIDUtils.get32UUID());
         enterpriseUserDO.setUserId(user.getUserId());
         enterpriseUserDO.setName(user.getName());
         enterpriseUserDO.setRemark(user.getRemark());

coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/SysDepartmentDTO.java

@@ -205,8 +205,8 @@ public class SysDepartmentDTO {
             region.setLeaderUserId(dept.getLeaderUserId());
             region.setOrderNum(dept.getDepartOrder());
             region.setThirdDeptId(dept.getId());
-            region.setCreateTime(System.currentTimeMillis());
-            region.setUpdateTime(System.currentTimeMillis());
+            region.setCreateTime(new Date());
+            region.setUpdateTime(new Date());
             List<String> pathIds = new ArrayList<>();
             pathIds.add(region.getRegionId());
             String parentId = parentMap.get(region.getRegionId());
@@ -238,8 +238,8 @@ public class SysDepartmentDTO {
         region.setLeaderUserId(dept.getLeaderUserId());
         region.setOrderNum(dept.getDepartOrder());
         region.setThirdDeptId(dept.getId());
-        region.setCreateTime(System.currentTimeMillis());
-        region.setUpdateTime(System.currentTimeMillis());
+        region.setCreateTime(new Date());
+        region.setUpdateTime(new Date());
         String regionPath = parentRegion.getRegionPath() + region.getRegionId() + CommonConstants.PATH_SPILT;
         region.setRegionPath(regionPath);
         region.setDeleted(Boolean.FALSE);
@@ -260,8 +260,8 @@ public class SysDepartmentDTO {
         region.setLeaderUserId(dept.getLeaderUserId());
         region.setOrderNum(dept.getDepartOrder());
         region.setThirdDeptId(dept.getId());
-        region.setCreateTime(System.currentTimeMillis());
-        region.setUpdateTime(System.currentTimeMillis());
+        region.setCreateTime(new Date());
+        region.setUpdateTime(new Date());
         region.setDeleted(Boolean.FALSE);
         if(CollectionUtils.isNotEmpty(dept.getDeptManagerUseridList())){
             for (String leader : dept.getDeptManagerUseridList()) {

coolstore-partner-model/src/main/java/com/cool/store/entity/EnterpriseUserDO.java

@@ -19,7 +19,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class EnterpriseUserDO implements Serializable {
     @ApiModelProperty("用户主键id")
-    private String id;
+    private Long id;
 
     @ApiModelProperty("用户id")
     private String userId;

coolstore-partner-model/src/main/java/com/cool/store/entity/RegionDO.java

@@ -2,6 +2,8 @@ package com.cool.store.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -45,13 +47,13 @@ public class RegionDO implements Serializable {
     private String thirdDeptId;
 
     @ApiModelProperty("创建时间")
-    private Long createTime;
+    private Date createTime;
 
     @ApiModelProperty("创建人")
     private String createName;
 
     @ApiModelProperty("更新时间")
-    private Long updateTime;
+    private Date updateTime;
 
     @ApiModelProperty("更新人")
     private String updateName;

coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.MessageFormat;
 import java.util.Objects;
 
 /**
@@ -78,12 +79,10 @@ public class LoginServiceImpl implements LoginService {
         //生成令牌
         RandomNumberGenerator randomNumberGenerator = new SecureRandomNumberGenerator();
         String token = randomNumberGenerator.nextBytes().toHex();
-        String refreshToken = randomNumberGenerator.nextBytes().toHex();
         currentUser.setName(enterpriseUser.getName());
         currentUser.setAccessToken(token);
-        redisUtilPool.setString(CommonConstants.ACCESS_TOKEN_KEY + ":" + token, JSON.toJSONString(currentUser), CommonConstants.ACCESS_TOKEN_EXPIRE);
+        redisUtilPool.setString(MessageFormat.format(CommonConstants.ACCESS_TOKEN_KEY, token), JSON.toJSONString(currentUser), CommonConstants.ACCESS_TOKEN_EXPIRE);
         redisUtilPool.setString(currentUser.getUserId(), token);
-        redisUtilPool.setString(CommonConstants.REFRESH_TOKEN_KEY+":"+refreshToken,JSON.toJSONString(refreshUser), CommonConstants.REFRESH_TOKEN_EXPIRE);
         log.info("[" + enterpriseUser.getName() + "; action_token："+ token + "; userId：" + currentUser.getUserId()  +"]登入系统成功");
         return currentUser;
     }

coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java

@@ -22,6 +22,7 @@ import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.text.MessageFormat;
 import java.util.List;
 import java.util.Objects;
 
@@ -83,7 +84,7 @@ public class TokenValidateFilter implements Filter {
         LoginUserInfo currentUser = null;
         boolean isInWhiteList = excludePath(uri);
         String accessToken = reqs.getHeader("accessToken");
-        String key = "access_token:" + accessToken;
+        String key = MessageFormat.format(CommonConstants.ACCESS_TOKEN_KEY, accessToken);
         if(StringUtils.isNotBlank(accessToken)){
             userStr = redisUtilPool.getString(key);
             if(StringUtils.isNotBlank(userStr)){