报警阀值云端多仓选择

src/main/java/com/chinaitop/depot/intelligent/basicdata/controller/WarningThresholdController.java

@@ -1,8 +1,10 @@
 package com.chinaitop.depot.intelligent.basicdata.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.chinaitop.depot.intelligent.basicdata.model.TWarningThreshold;
 import com.chinaitop.depot.intelligent.basicdata.model.TWarningThresholdList;
 import com.chinaitop.depot.intelligent.basicdata.service.WarningThresholdService;
+import com.chinaitop.depot.intelligent.utils.DepotStringUtil;
 import com.chinaitop.depot.intelligent.utils.JsonToObjectUtils;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -34,6 +36,8 @@ public class WarningThresholdController {
 
     @Autowired
     private WarningThresholdService warningThresholdService;
+    @Autowired
+    private DepotStringUtil stringUtil;
 
     @RequestMapping(value = "/getList", method = RequestMethod.GET)
     @ApiOperation(value = "查询 预警阈值 信息列表", notes = "查询 预警阈值 信息列表，支持分页")
@@ -75,13 +79,37 @@ public class WarningThresholdController {
         return ResponseEntity.ok(bycfCodeList);
     }
 
+    /**
+     * 根据时间和组织编码查询多仓房编码,组织编码拦截器获取
+     * @param updateTime
+     * @param vCfCode
+     * @return
+     */
+    @RequestMapping(value = "/getByTime", method = RequestMethod.GET)
+    @ApiOperation(value = "根据编辑时间查询 多个仓房编号", notes = "根据编辑时间查询 多个仓房编号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "getByTime", value = "编辑时间", paramType = "query")
+    })
+    public ResponseEntity getByTime(String updateTime, String vCfCode) {
+        // 查询条件为空直接返回单个仓房
+        if (StringUtils.isBlank(updateTime))
+            return ResponseEntity.ok(vCfCode);
+        // 获取带逗号的仓房编号字符串
+        String neverSeparateStoreCode = warningThresholdService.getCfCodeByTime(updateTime);
+        return ResponseEntity.ok(neverSeparateStoreCode);
+    }
+
     @RequestMapping(value = "/save", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value = "数据更新与添加", notes = "数据更新与添加")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "thresholdListJson", value = "表数据", paramType = "form"),
-            @ApiImplicitParam(name = "deleteRowId", value = "删除一条数据id", paramType = "query")
+            @ApiImplicitParam(name = "deleteRowId", value = "删除一条数据id", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "组织机构编码", paramType = "query"),
+            @ApiImplicitParam(name = "updateFlag", value = "修改标记", paramType = "query"),
+            @ApiImplicitParam(name = "updatevCfCode", value = "添加或减少后的仓房", paramType = "query"),
+            @ApiImplicitParam(name = "neverUpdateStoreCodes", value = "要修改前的仓房数", paramType = "query")
     })
-    public ResponseEntity save(String thresholdListJson, String deleteRowId) {
+    public ResponseEntity save(String thresholdListJson, String deleteRowId, String updateFlag, String orgId, String updatevCfCode, String neverUpdateStoreCodes) {
         // deleteRowId 为删除一条数据,再保存时才确定删除.
         if (StringUtils.isNotBlank(deleteRowId)) {
             // 调用删除方法
@@ -89,12 +117,29 @@ public class WarningThresholdController {
         }
         try {
             // JSON字符串转对象
-            if (thresholdListJson != null) {
+            if (StringUtils.isNotBlank(thresholdListJson)) {
                 ObjectMapper mapper = new ObjectMapper();
                 mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
                 List<TWarningThreshold> thresholdList = mapper.readValue(thresholdListJson, new TypeReference<List<TWarningThreshold>>() {
                 });
-                warningThresholdService.saveAndUpdate(thresholdList);
+                // 截取仓房编码
+                String[] splitBehindCode = updatevCfCode.split(","); // 修改后的仓房
+                // 判断需要修改还是保存,是否新增设置仓房
+                if ("U_FLAG".equals(updateFlag)) { // 修改
+                    thresholdList.forEach(tl -> {
+                        // 将id置空,不走updae方法
+                        tl.setId("");
+                    });
+                    // 需要删除的仓房信息=修改前∪修改后(并集)
+                    String union = stringUtil.getUnion(updatevCfCode, neverUpdateStoreCodes, ",");
+                    String[] split = union.split(",");
+                    thresholdListJson = JSON.toJSONString(thresholdList); // id置空的json字符串
+                    // 根据仓房编码和orgId删除主表和详情数据
+                    warningThresholdService.deleteByStoreCodeAndOrgId(split, orgId);
+                }
+                // 新增,修改处理数据
+                List<TWarningThreshold> newThresholdList = warningThresholdService.storeListData(thresholdListJson, splitBehindCode);
+                warningThresholdService.saveAndUpdate(newThresholdList, splitBehindCode); // splitBehindCode 截取之后的仓房数组
             }
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/chinaitop/depot/intelligent/basicdata/mapper/TWarningThresholdListMapper.java

@@ -27,4 +27,11 @@ public interface TWarningThresholdListMapper {
     int updateByPrimaryKeySelective(TWarningThresholdList record);
 
     int updateByPrimaryKey(TWarningThresholdList record);
+
+    /**
+     * 根据时间和组织编码查询多仓房编码,组织编码拦截器获取
+     * @param updateTime
+     * @return
+     */
+    String getCfCodeByTime(String updateTime);
 }

src/main/java/com/chinaitop/depot/intelligent/basicdata/mapper/TWarningThresholdListMapper.xml

@@ -303,4 +303,13 @@
       del_flag = #{delFlag,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
+  <select id="getCfCodeByTime" parameterType="java.lang.String" resultType="java.lang.String">
+    SELECT
+        GROUP_CONCAT(v_cf_code) v_cf_code
+    FROM
+        t_warning_threshold_list
+    WHERE
+        del_flag = '1'
+    AND update_time = #{updateTime}
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/intelligent/basicdata/service/WarningThresholdService.java

@@ -12,7 +12,7 @@ public interface WarningThresholdService {
 
     List<TWarningThreshold> getByCfCode(String cfCode, Integer wState,String orgId);
 
-    void saveAndUpdate(List<TWarningThreshold> thresholdList);
+    void saveAndUpdate(List<TWarningThreshold> thresholdList, String[] splitBehindCode);
 
     int deleteById(String id);
 
@@ -36,4 +36,21 @@ public interface WarningThresholdService {
      * @return
      */
     Map<String, Map<String, Object>> getValueByOrgIdOrCfCode(String orgId, String vCfCode);
+
+    /**
+     * 根据时间和组织编码查询多仓房编码,组织编码拦截器获取
+     * @param updateTime
+     * @return
+     */
+    String getCfCodeByTime(String updateTime);
+
+    //    String checkAddStore(String storeCodes);
+    List<TWarningThreshold> storeListData(String thresholdListJson, String[] splitBehindCode);
+
+    /**
+     * 根据仓房编码和orgId批量删除主表和详情数据
+     * @param splitBehindCode
+     * @param orgId
+     */
+    void deleteByStoreCodeAndOrgId(String[] splitBehindCode, String orgId);
 }

src/main/java/com/chinaitop/depot/intelligent/basicdata/service/impl/WarningThresholdServiceImpl.java

@@ -1,5 +1,6 @@
 package com.chinaitop.depot.intelligent.basicdata.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.chinaitop.depot.intelligent.basicdata.mapper.TWarningThresholdListMapper;
 import com.chinaitop.depot.intelligent.basicdata.mapper.TWarningThresholdMapper;
 import com.chinaitop.depot.intelligent.basicdata.model.TWarningThreshold;
@@ -72,42 +73,50 @@ public class WarningThresholdServiceImpl implements WarningThresholdService {
      * @param thresholdList
      */
     @Override
-    public void saveAndUpdate(List<TWarningThreshold> thresholdList) {
+    public void saveAndUpdate(List<TWarningThreshold> thresholdList, String[] splitBehindCode) {
+        // 使用时间作为组条件
+        Date date = new Date();
         for (TWarningThreshold tWarningThreshold : thresholdList) {
+            // 保存,修改共用set数据
+            tWarningThreshold.setwUpdateTime(date);
             // 保存详情
             if (StringUtils.isBlank(tWarningThreshold.getId())) {
                 tWarningThreshold.setId(uUidUtils.getCodeId(tWarningThreshold.getOrgId(), "t_warning_threshold"));
-                tWarningThreshold.setwUpdateTime(new Date());
                 tWarningThreshold.setDelFlag(1); //未删除
                 tWarningThresholdMapper.insert(tWarningThreshold);
             } else {
                 // 更新详情
-                tWarningThreshold.setwUpdateTime(new Date());
                 tWarningThresholdMapper.updateByPrimaryKeySelective(tWarningThreshold);
             }
         }
         // 保存,修改列表
         TWarningThreshold tWarningThreshold = thresholdList.get(0);
-        List<TWarningThresholdList> list = this.getList(tWarningThreshold.getvCfCode(),tWarningThreshold.getOrgId());
-        TWarningThresholdList tWarningThresholdList = new TWarningThresholdList();
-        if (list.size() == 0) {
-            // 保存
-            tWarningThresholdList.setId(uUidUtils.getCodeId(tWarningThreshold.getOrgId(), "t_warning_threshold"));
-            tWarningThresholdList.setOrgId(tWarningThreshold.getOrgId());
-            tWarningThresholdList.setvCfCode(tWarningThreshold.getvCfCode());
+        // 根据仓房编码多次修改列表
+        for (int i = 0; i < splitBehindCode.length; i++) {
+            // 获取每一个仓房编码
+            String storCode = splitBehindCode[i];
+            List<TWarningThresholdList> list = this.getList(storCode, tWarningThreshold.getOrgId());
+            TWarningThresholdList tWarningThresholdList = new TWarningThresholdList();
+            // 保存,修改共用set数据
+            tWarningThresholdList.setUpdateTime(date);
             tWarningThresholdList.setUpdatePerson(tWarningThreshold.getwUpdatePerson());
-            tWarningThresholdList.setUpdateTime(new Date());
-            tWarningThresholdList.setDelFlag(1); //未删除
-            tWarningThresholdListMapper.insert(tWarningThresholdList);
-        } else {
-            // 更新
-            TWarningThresholdListExample example = new TWarningThresholdListExample();
-            TWarningThresholdListExample.Criteria criteria = example.createCriteria();
-            if (StringUtils.isNotBlank(tWarningThreshold.getvCfCode()))
-                criteria.andVCfCodeEqualTo(tWarningThreshold.getvCfCode());
-            tWarningThresholdList.setUpdatePerson(tWarningThreshold.getwUpdatePerson());
-            tWarningThresholdList.setUpdateTime(new Date());
-            tWarningThresholdListMapper.updateByExampleSelective(tWarningThresholdList, example);
+            if (list.size() == 0) {
+                // 保存
+                tWarningThresholdList.setId(uUidUtils.getCodeId(tWarningThreshold.getOrgId(), "t_warning_threshold"));
+                tWarningThresholdList.setOrgId(tWarningThreshold.getOrgId());
+                tWarningThresholdList.setvCfCode(storCode);
+                tWarningThresholdList.setUpdatePerson(tWarningThreshold.getwUpdatePerson());
+                tWarningThresholdList.setDelFlag(1); //未删除
+                tWarningThresholdListMapper.insert(tWarningThresholdList);
+            } else {
+                // 更新
+                TWarningThresholdListExample example = new TWarningThresholdListExample();
+                TWarningThresholdListExample.Criteria criteria = example.createCriteria();
+                if (StringUtils.isNotBlank(storCode))
+                    criteria.andVCfCodeEqualTo(storCode);
+                tWarningThresholdList.setUpdatePerson(tWarningThreshold.getwUpdatePerson());
+                tWarningThresholdListMapper.updateByExampleSelective(tWarningThresholdList, example);
+            }
         }
     }
 
@@ -275,4 +284,50 @@ public class WarningThresholdServiceImpl implements WarningThresholdService {
         return mapObj;
     }
 
+    /**
+     * 根据时间和组织编码查询多仓房编码,组织编码拦截器获取
+     *
+     * @param updateTime
+     * @return
+     */
+    @Override
+    public String getCfCodeByTime(String updateTime) {
+        return tWarningThresholdListMapper.getCfCodeByTime(updateTime);
+    }
+
+    // 改变list数组,多仓房编码拆分成多个list
+    public List<TWarningThreshold> storeListData(String thresholdListJson, String[] splitBehindCode) {
+        // 缓存空间
+        List<TWarningThreshold> newThresholdList = new ArrayList<>();
+        // 截取仓房编码
+        for (int i = 0; i < splitBehindCode.length; i++) {
+            // 数据倍增,防止list数据"$ref": "$[0]" 重复引用对象地址
+            List<TWarningThreshold> tWarningThresholds = JSON.parseArray(thresholdListJson, TWarningThreshold.class);
+            for (int y = 0; y < tWarningThresholds.size(); y++) {
+                TWarningThreshold tWarningThreshold = tWarningThresholds.get(y);
+                tWarningThreshold.setvCfCode(splitBehindCode[i]);
+                newThresholdList.add(tWarningThreshold);
+            }
+        }
+        return newThresholdList;
+    }
+
+    @Override
+    public void deleteByStoreCodeAndOrgId(String[] splitBehindCode, String orgId) {
+        for (int i = 0; i < splitBehindCode.length; i++) {
+            // 删除列表数据
+            TWarningThresholdListExample example = new TWarningThresholdListExample();
+            TWarningThresholdListExample.Criteria criteria = example.createCriteria();
+            criteria.andVCfCodeEqualTo(splitBehindCode[i]);
+            criteria.andOrgIdEqualTo(orgId);
+            tWarningThresholdListMapper.deleteByExample(example);
+            // 删除详情数据
+            TWarningThresholdExample example1 = new TWarningThresholdExample();
+            TWarningThresholdExample.Criteria criteria1 = example1.createCriteria();
+            criteria1.andVCfCodeEqualTo(splitBehindCode[i]);
+            criteria1.andOrgIdEqualTo(orgId);
+            tWarningThresholdMapper.deleteByExample(example1);
+        }
+    }
+
 }

src/main/java/com/chinaitop/depot/intelligent/utils/DepotStringUtil.java

@@ -0,0 +1,33 @@
+package com.chinaitop.depot.intelligent.utils;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author qingsong.han
+ * @description: 库级字符串处理工具类
+ * @create 2020-09-14 11:22
+ */
+@Component
+public class DepotStringUtil {
+
+    // 获取两个字符串的并集(去重后取并集)
+    public static String getUnion(String str1,String str2,String regex) {
+
+        if (StringUtils.isEmpty(str1) || StringUtils.isEmpty(str2)) {
+            return StringUtils.isEmpty(str1) ? str2 : str1;
+        }
+        StringBuilder sBuilder = new StringBuilder(str2);
+        String[] array = str1.split(regex);
+        for (String s : array) {
+            if (StringUtils.isEmpty(s)) {
+                continue;
+            }
+            if (!str2.contains(s)) {
+                sBuilder.append(",").append(s);
+            }
+        }
+        return sBuilder.toString();
+    }
+
+}