接口调整

web/src/main/java/com/imitate/web/module/simulation/controller/UpholdArgsInfoController.java

@@ -1,6 +1,7 @@
 package com.imitate.web.module.simulation.controller;
 
 
+import cn.hutool.core.io.FileUtil;
 import com.github.pagehelper.PageInfo;
 import com.imitate.common.enums.ErrorCodeEnum;
 import com.imitate.common.util.BasicController;
@@ -16,8 +17,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
+import java.io.File;
+import java.io.IOException;
 
 /**
  * <p>
@@ -90,4 +94,19 @@ public class UpholdArgsInfoController extends BasicController {
         }
     }
 
+
+
+    @ApiOperation(value = "算法参数信息维护导入", httpMethod = "POST")
+    @RequestMapping(path = "/importParam",method = RequestMethod.POST)
+    public  R importParam(@RequestParam("file") MultipartFile file) throws IOException {
+        log.info("[start]算法参数信息维护导入 - 数据导入");
+        File f = new File("/tmp/" + file.getOriginalFilename());
+        file.transferTo(f);
+        String content = FileUtil.readUtf8String(f);
+        log.info("上传文件内容: {}", content);
+        Boolean b = upholdAlgorithmInfoService.createImportParam(content);
+        return R.ok().setData(b);
+    }
+
+
 }

web/src/main/java/com/imitate/web/module/simulation/service/ManagerSystemService.java

@@ -7,6 +7,7 @@ import com.imitate.web.persistence.beans.ManagerSystem;
 import com.imitate.web.persistence.mapper.ManagerSystemMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Example;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -47,4 +48,11 @@ public class ManagerSystemService {
         List<ManagerSystem> list = managerSystemMapper.select(param.getManagerSystem());
         return new PageInfo<>(list);
     }
+
+
+    public ManagerSystem getSuperior(){
+        Example example = new Example(ManagerSystem.class);
+        example.createCriteria().andEqualTo("level",0);
+        return managerSystemMapper.selectOneByExample(example);
+    }
 }

web/src/main/java/com/imitate/web/module/simulation/service/SecretBodyService.java

@@ -11,6 +11,7 @@ import com.imitate.web.params.SecretImportParam;
 import com.imitate.web.params.SecretIssueMailboxParam;
 import com.imitate.web.params.SecretIssuePrivateParam;
 import com.imitate.web.params.SecretIssueSubordinateParam;
+import com.imitate.web.persistence.beans.DeviceType;
 import com.imitate.web.persistence.beans.SecretAsk;
 import com.imitate.web.persistence.beans.SecretBodyAcceptance;
 import com.imitate.web.persistence.beans.SecretFormat;
@@ -30,6 +31,8 @@ import com.imitate.web.persistence.mapper.SecretIssuePrivateMapper;
 import com.imitate.web.persistence.mapper.SecretIssueSubordinateMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import sun.lwawt.macosx.CSystemTray;
+import tk.mybatis.mapper.entity.Example;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -146,6 +149,7 @@ public class SecretBodyService {
         SecretImport secretImport5 = new SecretImport();
         SecretImport secretImportVpn = new SecretImport();
         SecretImport secretImportOne = new SecretImport();
+        SecretImport secretImportPro = new SecretImport();
 
 
 
@@ -249,6 +253,28 @@ public class SecretBodyService {
             secretImportOne.setImportTime(LocalDateTime.now());
             list.add(secretImportOne);
         }
+
+        //查询是否已经添加专用秘钥  专用秘钥只需要添加1次
+        Example example = new Example(SecretImport.class);
+        example.createCriteria().andEqualTo("sysType", sysType).andEqualTo("keyType","专用秘钥装配 PMCS");
+        List<SecretImport> proList = secretImportMapper.selectByExample(example);
+        if(proList == null){
+            //初始化未装配的专用秘钥
+            secretImportPro.setSysType(sysType);
+            secretImportPro.setKeyType("专用秘钥装配 PMCS");
+            secretImportPro.setProductName("专用秘钥装配 PMCS");
+            secretImportPro.setProductNum("PMCS");
+            secretImportPro.setCarrierType(carrierType);
+            secretImportPro.setApplyNum(1);
+            secretImportPro.setApplyModel(carrierModel);
+            secretImportPro.setNumber(2);
+            secretImportPro.setSource(net);
+            secretImportPro.setCurrentStatus("未使用");
+            secretImportPro.setIsClean(0);
+            list.add(secretImportPro);
+        }
+
+
         secretImportMapper.insertList(list);
     }
 
@@ -262,6 +288,7 @@ public class SecretBodyService {
     public PageInfo<SecretImport> secretList(SecretImportParam param) {
         PageHelper.startPage(param.getPageNumber(), param.getPageSize());
         List<SecretImport> list = secretImportMapper.selectAllByParam(param);
+
         return new PageInfo<>(list);
     }
 

web/src/main/java/com/imitate/web/module/simulation/service/SecretInstallService.java

@@ -85,10 +85,10 @@ public class SecretInstallService {
                 secretImport.setSysType(sysType);
                 secretImport.setDistType("分发状态");
                 secretImport.setInstallMethod("安装方式");
-                secretImport.setStartDate("20220922");
+                secretImport.setStartDate(activeDate);
                 secretImport.setSetNumber("套号");
                 secretImport.setCarrierType(secretImport.getCarrierType());
-                secretImport.setEnterDate("20232211");
+                secretImport.setEnterDate(endDate);
                 secretImport.setManagementFlag("协同管理标志");
                 secretImport.setAssemblySituation("已装配");
 
@@ -103,10 +103,10 @@ public class SecretInstallService {
                 secretImport.setSysType(sysType);
                 secretImport.setDistType("分发状态");
                 secretImport.setInstallMethod("安装方式");
-                secretImport.setStartDate("20220922");
+                secretImport.setStartDate(activeDate);
                 secretImport.setSetNumber("套号");
                 secretImport.setCarrierType(secretImport.getCarrierType());
-                secretImport.setEnterDate("20232211");
+                secretImport.setEnterDate(endDate);
                 secretImport.setManagementFlag("协同管理标志");
                 secretImport.setAssemblySituation("已装配");
 
@@ -115,13 +115,11 @@ public class SecretInstallService {
                 secretImport.setCreateTime(nowAsString);
                 secretImport.setUpdateTime(nowAsString);
                 secretImportMapper.updateByPrimaryKeySelective(secretImport);
-
                 break;
             case 3:
-                //专用密钥装配
-
-
-
+                //专用秘钥
+                secretImport.setAssemblySituation("已装配");
+                secretImportMapper.updateByPrimaryKeySelective(secretImport);
                 break;
             default:
                 break;

web/src/main/java/com/imitate/web/module/simulation/service/UpholdArgsInfoService.java

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.imitate.common.config.DateConfig;
 import com.imitate.common.enums.DelFlagEnum;
 import com.imitate.web.params.UpholdArgsInfoListParam;
+import com.imitate.web.persistence.beans.ManagerSystem;
 import com.imitate.web.persistence.beans.UpholdArgsInfo;
 import com.imitate.web.persistence.mapper.UpholdArgsInfoMapper;
 import org.apache.commons.collections4.CollectionUtils;
@@ -27,6 +28,9 @@ public class UpholdArgsInfoService {
     @Autowired
     private UpholdArgsInfoMapper upholdArgsInfoMapper;
 
+    @Autowired
+    private  ManagerSystemService managerSystemService;
+
     public UpholdArgsInfo getById(Long id) {
         return upholdArgsInfoMapper.selectByPrimaryKey(id);
     }
@@ -56,4 +60,18 @@ public class UpholdArgsInfoService {
         List<UpholdArgsInfo> list = upholdArgsInfoMapper.selectAllByParam(param);
         return new PageInfo<>(list);
     }
+
+    public boolean createImportParam(String content){
+        //查询上级信息
+        ManagerSystem managerSystem = managerSystemService.getSuperior();
+        //如果导入文件内容 等于他上级的实体标识 则判断为导入了正确的文件
+        if(managerSystem != null && content.equals(managerSystem.getSysEntityId())){
+            return Boolean.TRUE;
+        }
+        return Boolean.FALSE;
+    }
+
+
+
+
 }

web/src/main/java/com/imitate/web/persistence/beans/ManagerSystem.java

@@ -51,11 +51,7 @@ public class ManagerSystem extends AbstractDO{
     @Length(max= 64,message="编码长度不能超过64")
     @NotBlank(message = "系统名称不能为空")
     private String sysName;
-    /**
-     * 系统型号
-     */
-    @ApiModelProperty("系统型号")
-    private Integer sysType;
+
     /**
      * 实体标识
      */