新增接口

imitsys.sql

@@ -283,6 +283,7 @@ CREATE TABLE
         `current_status` VARCHAR(255) COMMENT "当前状态",
         `is_clean` INT(11) COMMENT "秘钥是否已清理",
         `import_time` DATETIME COMMENT "导入时间",
+        `key_type` VARCHAR(255) COMMENT "密钥种类",
         create_time timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
         update_time timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间'
     ) COMMENT '秘钥体导入';
@@ -300,7 +301,7 @@ CREATE TABLE
         `is_interface` VARCHAR(255) COMMENT "是否制作接口",
         `send_unit` VARCHAR(255) COMMENT "发送单位",
         `password_type` VARCHAR(255) COMMENT "密码种类",
-        `number_carriers` VARCHAR(255) COMMENT "载体数量",
+        `number_carriers` INT(11) COMMENT "载体数量",
         `code_carriers` VARCHAR(255) COMMENT "载体编号",
         `apply_model` VARCHAR(255) COMMENT "载体型号",
         `number` INT(11) COMMENT "套数",

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

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.imitate.common.enums.ErrorCodeEnum;
 import com.imitate.common.util.BasicController;
 import com.imitate.common.util.R;
 import com.imitate.web.module.simulation.service.ParameterSetService;
@@ -44,15 +45,11 @@ public class ParameterSetController extends BasicController{
         if(bindingResult.hasErrors()){
             return actionResultWithBindingResult(ErrorCodeEnum.BIND_EXCEPTION,bindingResult);
         }
-
+        log.info("[end]参数设置,return");
         if (parameterSetService.updateOrAdd(param.getParameterSet())>0){
-            return R.ok().setData(dataTerminalParam.getDataTerminal());
-        }else {
-            return R.error();
+            return R.ok();
         }
-
-        log.info("[end]参数设置,return");
-        return R.ok();
+        return R.error();
     }
 
 

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

@@ -16,8 +16,10 @@ import com.imitate.common.util.BasicController;
 import com.imitate.common.util.R;
 import com.imitate.web.module.simulation.service.SecretFormatService;
 import com.imitate.web.params.SecretAskParam;
+import com.imitate.web.params.SecretBodyAcceptanceParam;
 import com.imitate.web.params.SecretFormatParam;
 import com.imitate.web.params.SecretImportParam;
+import com.imitate.web.persistence.beans.SecretBodyAcceptance;
 import com.imitate.web.persistence.beans.SecretFormat;
 import com.imitate.web.persistence.beans.SecretImport;
 
@@ -115,7 +117,7 @@ public class SecretFormatController extends BasicController{
     }
     
 
-    @ApiOperation(value = "修改密钥体状态 密钥体删除 还原  清理")
+    @ApiOperation(value = "修改密钥体状态 密钥体 1 删除 2还原  3清理")
     @RequestMapping(path = "updateSecret",method = RequestMethod.POST)
     public R updateSecret(Integer type,Integer id){
         log.info("[start]修改密钥体状态,type:{}, id:{}", type, id);
@@ -126,5 +128,26 @@ public class SecretFormatController extends BasicController{
 
 
 
+    @ApiOperation(value = "密钥体接收单列表")
+    @RequestMapping(path = "secretList",method = RequestMethod.GET)
+    public R secretBodyList(@RequestBody @Valid SecretBodyAcceptanceParam param, BindingResult bindingResult){
+        if (bindingResult.hasErrors()) {
+            return actionResultWithBindingResult(ErrorCodeEnum.BIND_EXCEPTION, bindingResult);
+        }
+
+        log.info("[start]密钥体接收单列表,param:{}",param);
+        PageInfo<SecretBodyAcceptance> pages = secretFormatService.secretBodyAcceptanceList(param);
+        log.info("[end]密钥体接收单列表,pages:{}",pages);
+        return R.ok().setData(pages);
+    }
+
+
+    
+
+    
+
+
+
+    
 
 }

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

@@ -21,7 +21,7 @@ public class ParameterSetService {
 
 
 
-    public ParameterSet updateOrAdd(ParameterSet parameterSet){
+    public Integer updateOrAdd(ParameterSet parameterSet){
         LocalDateTime now = LocalDateTime.now();
         if (null == parameterSet.getId()){
             if(StringUtils.isEmpty(parameterSet.getIpAddress())){

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

@@ -3,20 +3,19 @@ package com.imitate.web.module.simulation.service;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
-
-import javax.validation.Valid;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.imitate.web.params.SecretAskParam;
+import com.imitate.web.params.SecretBodyAcceptanceParam;
 import com.imitate.web.params.SecretFormatParam;
 import com.imitate.web.params.SecretImportParam;
+import com.imitate.web.persistence.beans.SecretBodyAcceptance;
 import com.imitate.web.persistence.beans.SecretFormat;
 import com.imitate.web.persistence.beans.SecretImport;
 import com.imitate.web.persistence.mapper.SecretAskMapper;
+import com.imitate.web.persistence.mapper.SecretBodyAcceptanceMapper;
 import com.imitate.web.persistence.mapper.SecretFormatMapper;
 import com.imitate.web.persistence.mapper.SecretImportMapper;
 
@@ -33,6 +32,9 @@ public class SecretFormatService {
     @Autowired
     private SecretImportMapper secretImportMapper;
 
+    @Autowired
+    private SecretBodyAcceptanceMapper secretBodyAcceptanceMapper;
+
 
     /**
      * 密钥体导入
@@ -107,6 +109,9 @@ public class SecretFormatService {
             secretImport.setSource("离线来自111系统");
             secretImport.setCurrentStatus("未使用");
             secretImport.setIsClean(0);
+            secretImport.setKeyType("111管理密钥");
+            secretImport.setCreateTime(LocalDateTime.now());
+            secretImport.setUpdateTime(LocalDateTime.now());
             secretImport.setImportTime(LocalDateTime.now());
 
             SecretImport secretImport1 = new SecretImport();
@@ -119,6 +124,9 @@ public class SecretFormatService {
             secretImport1.setSource("离线来自111系统");
             secretImport1.setCurrentStatus("使用");
             secretImport1.setIsClean(0);
+            secretImport1.setKeyType("222用户密钥");
+            secretImport1.setCreateTime(LocalDateTime.now());
+            secretImport1.setUpdateTime(LocalDateTime.now());
             secretImport1.setImportTime(LocalDateTime.now());
 
             SecretImport secretImport2 = new SecretImport();
@@ -131,6 +139,9 @@ public class SecretFormatService {
             secretImport2.setSource("离线来自111系统");
             secretImport2.setCurrentStatus("未使用");
             secretImport2.setIsClean(0);
+            secretImport2.setKeyType("333用户密钥");
+            secretImport2.setCreateTime(LocalDateTime.now());
+            secretImport2.setUpdateTime(LocalDateTime.now());
             secretImport2.setImportTime(LocalDateTime.now());
 
 
@@ -186,5 +197,56 @@ public class SecretFormatService {
     }
 
 
+    /**
+     * 添加密钥体接收单
+     * @param id  导入的 密钥体列表中某条记录的id  状态改为已使用
+     */
+    public void addSecretBodyAcceptance(Integer id){
+        SecretImport secretImport = secretImportMapper.selectByPrimaryKey(id);
+        if(secretImport != null){
+            secretImport.setCurrentStatus("已使用");
+            secretImportMapper.updateByPrimaryKeySelective(secretImport);
+
+            //添加到接收单表
+            SecretBodyAcceptance secretBodyAcceptance = new SecretBodyAcceptance();
+            secretBodyAcceptance.setProductName(secretImport.getProductName());
+            secretBodyAcceptance.setProductNum(secretImport.getProductNum());
+            secretBodyAcceptance.setSource(secretImport.getSource());
+            secretBodyAcceptance.setOperator("admin");
+            secretBodyAcceptance.setImportTime(secretImport.getImportTime());
+            secretBodyAcceptance.setIsInterface("是");
+            secretBodyAcceptance.setSendUnit("发送单位");
+            secretBodyAcceptance.setPasswordType(secretImport.getKeyType());
+            secretBodyAcceptance.setNumberCarriers(secretImport.getApplyNum());
+            secretBodyAcceptance.setCodeCarriers(secretImport.getApplyModel());
+            secretBodyAcceptance.setNumber(secretImport.getNumber());
+            secretBodyAcceptance.setNotes("备注");
+            secretBodyAcceptanceMapper.insertSelective(secretBodyAcceptance);
+        }
+    }
+
+
+
+
+    /**
+     * 密钥体接收单列表
+     * @param param
+     * @return
+     */
+    public PageInfo<SecretBodyAcceptance> secretBodyAcceptanceList(SecretBodyAcceptanceParam param) {
+        PageHelper.startPage(param.getPageNumber(), param.getPageSize());
+        List<SecretBodyAcceptance> list = secretBodyAcceptanceMapper.selectAllByParam(param);
+        return new PageInfo<>(list);
+    }
+
+
+    
+
+
+
+
+
+
+
 
 }

web/src/main/java/com/imitate/web/params/SecretBodyAcceptanceParam.java

@@ -0,0 +1,19 @@
+package com.imitate.web.params;
+
+import java.io.Serializable;
+
+import com.imitate.common.util.BasePageCondition;
+import com.imitate.web.persistence.beans.SecretBodyAcceptance;
+
+import lombok.Data;
+
+@Data
+public class SecretBodyAcceptanceParam extends BasePageCondition implements Serializable{
+    
+    private SecretBodyAcceptance secretBodyAcceptance;
+
+    {
+        this.secretBodyAcceptance = new SecretBodyAcceptance();
+    }
+
+}

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

@@ -1,6 +1,7 @@
 package com.imitate.web.persistence.beans;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import javax.persistence.Table;
@@ -24,7 +25,7 @@ public class SecretBodyAcceptance extends AbstractDO{
 
     private String operator;
 
-    private Date importTime;
+    private LocalDateTime importTime;
 
     private String isInterface;
 
@@ -32,7 +33,7 @@ public class SecretBodyAcceptance extends AbstractDO{
 
     private String passwordType;
 
-    private String numberCarriers;
+    private Integer numberCarriers;
 
     private String codeCarriers;
 

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

@@ -36,6 +36,8 @@ public class SecretImport extends AbstractDO {
 
     private LocalDateTime importTime;
 
+    private String keyType;
+
     public SecretImport(){}
 
 

web/src/main/java/com/imitate/web/persistence/mapper/SecretBodyAcceptanceMapper.java

@@ -1,6 +1,7 @@
 package com.imitate.web.persistence.mapper;
 
 import com.imitate.common.util.BaseMapper;
+import com.imitate.web.params.SecretBodyAcceptanceParam;
 import com.imitate.web.persistence.beans.SecretBodyAcceptance;
 import java.util.List;
 
@@ -12,4 +13,6 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface SecretBodyAcceptanceMapper extends BaseMapper<SecretBodyAcceptance>{
 
+    List<SecretBodyAcceptance> selectAllByParam(SecretBodyAcceptanceParam param);
+
 }

web/src/main/resources/mybatis/SecretBodyAcceptanceMapper.xml

@@ -11,7 +11,7 @@
     <result column="is_interface" property="isInterface" jdbcType="VARCHAR" />
     <result column="send_unit" property="sendUnit" jdbcType="VARCHAR" />
     <result column="password_type" property="passwordType" jdbcType="VARCHAR" />
-    <result column="number_carriers" property="numberCarriers" jdbcType="VARCHAR" />
+    <result column="number_carriers" property="numberCarriers" jdbcType="INTEGER" />
     <result column="code_carriers" property="codeCarriers" jdbcType="VARCHAR" />
     <result column="apply_model" property="applyModel" jdbcType="VARCHAR" />
     <result column="number" property="number" jdbcType="INTEGER" />
@@ -20,4 +20,23 @@
     <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
   </resultMap>
 
+
+
+  <select id="selectAllByParam" resultMap="BaseResultMap">
+    SELECT
+    a.id, a.product_name, a.product_num, a.source, a.operator, a.import_time, a.is_interface, a.send_unit,a.password_type,a.number_carriers,a.code_carriers,a.apply_model,a.number,a.notes,a.create_time,a.update_time
+    FROM
+    secret_body_acceptance a
+    WHERE 1=1
+    <if test="param.operator !=null and param.operator !=''">
+      AND a.operator = #{param.operator}
+    </if>
+    <if test="param.sendUnit !=null and param.sendUnit !=''">
+      AND a.send_unit = #{param.carrierType}
+    </if>
+  </select>
+
+  
+
+  
 </mapper>

web/src/main/resources/mybatis/SecretImportMapper.xml

@@ -13,6 +13,7 @@
     <result column="current_status" property="currentStatus" jdbcType="VARCHAR" />
     <result column="is_clean" property="isClean" jdbcType="INTEGER" />
     <result column="import_time" property="importTime" jdbcType="TIMESTAMP" />
+    <result column="key_type" property="keyType" jdbcType="keyType" />
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
     <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
   </resultMap>
@@ -26,7 +27,7 @@
 
   <select id="selectAllByParam" resultMap="BaseResultMap">
     SELECT
-    a.id, a.product_name, a.product_num, a.carrier_type, a.apply_num, a.apply_model, a.number, a.source,a.current_status,a.is_clean,a.import_time,a.apply_type,a.create_time,a.update_time
+    a.id, a.product_name, a.product_num, a.carrier_type, a.apply_num, a.apply_model, a.number, a.source,a.current_status,a.is_clean,a.import_time,a.apply_type,a.key_type,a.create_time,a.update_time
     FROM
     secret_import a
     WHERE 1=1
@@ -42,6 +43,9 @@
     <if test="param.isClean !=null and param.isClean !=''">
       AND a.is_clean = #{param.isClean}
     </if>
+    <if test="param.keyType !=null and param.keyType !=''">
+      AND a.key_type = #{param.keyType}
+    </if>
 
   </select>