Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the, 企标顺序号关联逻辑 See merge request LiuChao/foton-slrs-system-rest!548
2022-07-02 22:41:27 +08:00
parent 36d7838206 4131965f6e
commit 58fa98fe3a
10 changed files with 257 additions and 7 deletions
@@ -0,0 +1,38 @@
+package com.adc.da.slrs.sarBussStandSn.controller;
+
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarBussStandSn.service.ISarBussStandSnService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.sarBussStandSn.entity.SarBussStandSn;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+/**
+* <p>
+    * 企业标准信息表 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2022-07-01
+*/
+@RestController
+@Api(tags = "|SarBussStandSn|")
+@RequestMapping("/sarBussStandSn/sar-buss-stand-sn")
+public class SarBussStandSnController extends BaseController<SarBussStandSn> {
+
+    @Autowired
+    private ISarBussStandSnService iSarBussStandSnService;
+
+    @ApiOperation(value = "更新企标顺序号状态")
+    @GetMapping("modSnByProcess")
+    public ResponseMessage<Object> modSnByProcess(@RequestParam("taskId") String taskId){
+        return Result.success(iSarBussStandSnService.modSnByProcess(taskId));
+    }
+}
@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarBussStandSn.dao;
+
+import com.adc.da.slrs.sarBussStandSn.entity.SarBussStandSn;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 企业标准信息表 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2022-07-01
+ */
+public interface SarBussStandSnDao extends BaseMapper<SarBussStandSn> {
+
+}
@@ -0,0 +1,70 @@
+package com.adc.da.slrs.sarBussStandSn.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 企业标准信息表
+ * </p>
+ *
+ * @author super_liu
+ * @since 2022-07-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarBussStandSn对象", description="企业标准信息表")
+public class SarBussStandSn extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId("ID")
+    private String id;
+
+    @ApiModelProperty(value = "计划库制定状态 0 默认 buss1_1 技术标准 制定 buss2_1 产品标准 制定 ")
+    @TableField("REVISE_STATUS")
+    private String reviseStatus;
+
+    @ApiModelProperty(value = "企标顺序号")
+    @TableField("STAND_SN")
+    private String standSn;
+
+    @ApiModelProperty(value = "企标类别")
+    @TableField("STAND_SORT")
+    private String standSort;
+
+    @ApiModelProperty(value = "企标编号使用状态 yes 已使用 no 未使用")
+    @TableField("USE_STATUS")
+    private String useStatus;
+
+    @ApiModelProperty(value = "是否有效")
+    @TableField("VALID_FLAG")
+    private String validFlag;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATION_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date creationTime;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("MODIFY_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date modifyTime;
+
+    @ApiModelProperty(value = "任务ID 不为 null 取当前任务顺序号")
+    @TableField("TASK_ID")
+    private String taskId;
+
+
+}
@@ -0,0 +1,17 @@
+package com.adc.da.slrs.sarBussStandSn.service;
+
+import com.adc.da.slrs.sarBussStandSn.entity.SarBussStandSn;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 企业标准信息表 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2022-07-01
+ */
+public interface ISarBussStandSnService extends IService<SarBussStandSn> {
+
+    Boolean modSnByProcess(String taskId);
+}
@@ -0,0 +1,41 @@
+package com.adc.da.slrs.sarBussStandSn.service.impl;
+
+import com.adc.da.slrs.sarBussStandSn.entity.SarBussStandSn;
+import com.adc.da.slrs.sarBussStandSn.dao.SarBussStandSnDao;
+import com.adc.da.slrs.sarBussStandSn.service.ISarBussStandSnService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 企业标准信息表 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2022-07-01
+ */
+@Service
+public class SarBussStandSnServiceImpl extends ServiceImpl<SarBussStandSnDao, SarBussStandSn> implements ISarBussStandSnService {
+
+    @Autowired
+    private ISarBussStandSnService iSarBussStandSnService;
+
+    @Override
+    public Boolean modSnByProcess(String taskId){
+        QueryWrapper qw = new QueryWrapper();
+        qw.eq("TASK_ID",taskId);
+        int count = iSarBussStandSnService.count(qw);
+        if(count > 0){
+            UpdateWrapper updateWrapper = new UpdateWrapper();
+            updateWrapper.set("USE_STATUS","no");
+            updateWrapper.set("TASK_ID",null);
+            updateWrapper.eq("TASK_ID",taskId);
+            return iSarBussStandSnService.update(updateWrapper);
+        }
+
+        return false;
+    }
+}
@@ -83,9 +83,11 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
    @ApiOperation(value = "|SarBussionessStandEO|根据计划库制定状态查询企标编号")
    @GetMapping("/getStandInfoByReviseStatus")
    //@RequiresPermissions("lawss:sarStandardsInfo:get")
-    public ResponseMessage<SarBussionessStand> getStandInfoByReviseStatus(String reviseStatus,String standSort) {
-        SarBussionessStand result = sarBussionessStandEOService.getStandInfoByReviseStatus(reviseStatus,standSort);
-        return Result.success(result);
+    public ResponseMessage<SarBussionessStand> getStandInfoByReviseStatus(String reviseStatus,String standSort,String taskId) {
+        synchronized (this){
+            SarBussionessStand result = sarBussionessStandEOService.getStandInfoByReviseStatus(reviseStatus,standSort,taskId);
+            return Result.success(result);
+        }
    }

    @ApiOperation(value = "|SarBussionessStandEO|删除")
@@ -19,7 +19,7 @@ import java.util.List;
 */
 public interface ISarBussionessStandService extends IService<SarBussionessStand> {

-    SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort);
+    SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort,String taskId);

    void attrInfoDetails (SarBussionessStand row) throws Exception;

@@ -29,6 +29,8 @@ import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile;
 import com.adc.da.slrs.sarBussStandItems.dao.SarBussStandItemsDao;
 import com.adc.da.slrs.sarBussStandMenu.dao.SarBussStandMenuDao;
 import com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu;
+import com.adc.da.slrs.sarBussStandSn.entity.SarBussStandSn;
+import com.adc.da.slrs.sarBussStandSn.service.ISarBussStandSnService;
 import com.adc.da.slrs.sarBussStandVal.dao.SarBussStandValDao;
 import com.adc.da.slrs.sarBussStandVal.entity.SarBussStandVal;
 import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
@@ -164,9 +166,68 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
    @Autowired
    private INewsFeedService iNewsFeedService;

+    @Autowired
+    private ISarBussStandSnService iSarBussStandSnService;
+
    @Override
-    public SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort){
-        return sarBussionessStandEODao.getStandInfoByReviseStatus(reviseStatus,standSort);
+    public SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort,String taskId){
+        SarBussionessStand bussionessStand = new SarBussionessStand();
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("REPLACE(STAND_SORT,' ','')",standSort.replace(" ",""));
+        int count = iSarBussStandSnService.count(queryWrapper);
+        // 1 先验证 当前企标类别 是否存在顺序号
+        if(count > 0){
+            QueryWrapper qw = new QueryWrapper();
+            qw.eq("REPLACE(STAND_SORT,' ','')",standSort.replace(" ",""));
+            qw.eq("TASK_ID",taskId);
+            qw.eq("USE_STATUS","yes");
+            SarBussStandSn sns = iSarBussStandSnService.getOne(qw);
+            // 1.1 防止不同步撤回 页面未退出 及 防止页面刷新 已锁定的顺序号 被一直叠加 获取当前任务之前生成的顺序号
+            if(sns != null && sns.getId() != null){
+                // 1.1.1 返回顺序号
+                bussionessStand.setNewStandSn(sns.getStandSn());
+            }else {
+                QueryWrapper wrapper = new QueryWrapper();
+                wrapper.select("MIN(DISTINCT CAST(STAND_SN AS decimal(9))) AS STAND_SN");
+                wrapper.eq("REPLACE(STAND_SORT,' ','')",standSort.replace(" ",""));
+                qw.isNull("TASK_ID");
+                qw.eq("USE_STATUS","no");
+                SarBussStandSn standSn = iSarBussStandSnService.getOne(wrapper);
+                // 1.1.2 查询 被撤回的 任务ID 被重置NULL 及 状态被重置 no 未使用 最小值 。。 "自动带入"  "自动获取"  未被使用最小 顺序号
+                if(standSn.getId() != null) {
+                    // 1.1.2.1 返回顺序号
+                    bussionessStand.setNewStandSn(standSn.getStandSn());
+                }else {
+
+                    QueryWrapper wrapper1 = new QueryWrapper();
+                    wrapper1.select("MAX(DISTINCT CAST(STAND_SN AS decimal(9)))+1 AS STAND_SN");
+                    wrapper1.eq("REPLACE(STAND_SORT,' ','')",standSort.replace(" ",""));
+                    SarBussStandSn one = iSarBussStandSnService.getOne(wrapper);
+                    // 1.1.2.2 返回顺序号
+                    bussionessStand.setNewStandSn(one.getStandSn());
+                    // 1.1.2.3 获取新的顺序号 存入顺序号表中
+                    saveBussStandSn(reviseStatus, standSort, one.getStandSn(),taskId);
+                }
+
+            }
+        }else {
+            // 2 获取企标库中 当前类别 最新 顺序号 （前提必须顺序号为正规数据）
+            bussionessStand = sarBussionessStandEODao.getStandInfoByReviseStatus(reviseStatus,standSort);
+            saveBussStandSn(reviseStatus, standSort, bussionessStand.getStandSn(),taskId);
+        }
+
+        return bussionessStand;
+    }
+
+    private void saveBussStandSn(String reviseStatus, String standSort, String standSn,String taskId) {
+        SarBussStandSn sn = new SarBussStandSn();
+        sn.setId(UUIDUtils.randomUUID20());
+        sn.setStandSort(standSort);
+        sn.setStandSn(standSn);
+        sn.setModifyTime(new Date());
+        sn.setReviseStatus(reviseStatus);
+        sn.setTaskId(taskId);
+        iSarBussStandSnService.saveOrUpdate(sn);
    }

    public ResponseMessage<SarBussionessStand> deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception {
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.sarBussStandSn.dao.SarBussStandSnDao">
+
+</mapper>
@@ -352,7 +352,7 @@

    <select id="getStandInfoByReviseStatus" resultMap="BaseResultMap" parameterType="java.lang.String">
        select MAX(DISTINCT CAST(STAND_SN AS decimal(9)))+1 AS newStandSn from sar_bussioness_stand
-        where revise_status = #{value} and REPLACE(STAND_SORT,' ','') = REPLACE(#{standSort},' ','') and valid_flag=0
+        where REPLACE(STAND_SORT,' ','') = REPLACE(#{standSort},' ','') and valid_flag=0
    </select>

    <!-- 删除记录 -->