新增接口

master
颜超 2 years ago
parent fe243a6920
commit 6a6c36156c

@ -358,24 +358,25 @@ CREATE TABLE
update_time timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间'
) COMMENT '向邮箱配发表';
DROP TABLE IF EXISTS secret_issue_private;
CREATE TABLE
secret_issue_private (
id int NOT NULL PRIMARY KEY AUTO_INCREMENT COMMENT 'Primary Key',
`duty_name` VARCHAR(255) COMMENT "执勤区名称",
`duty_area_identify` VARCHAR(255) COMMENT "执勤区标识",
`affiliated_network` VARCHAR(255) COMMENT "所属网络",
`ip_address` VARCHAR(255) COMMENT "IP地址",
`product_name` VARCHAR(255) COMMENT "产品名称",
`product_code` VARCHAR(255) COMMENT "产品编号",
`issue_manager_sys_name` VARCHAR(255) COMMENT "配发管理系统名称",
`operate_time` VARCHAR(255) COMMENT "操作时间",
`operate_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT "操作时间",
`sync_status` 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 '向专用密码管理系统配发表';
DROP TABLE IF EXISTS secret_issue_three_one;
CREATE TABLE

@ -19,9 +19,13 @@ 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.params.SecretIssueMailboxParam;
import com.imitate.web.params.SecretIssueSubordinateParam;
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.beans.SecretIssueMailbox;
import com.imitate.web.persistence.beans.SecretIssueSubordinate;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -141,9 +145,46 @@ public class SecretFormatController extends BasicController{
return R.ok().setData(pages);
}
@ApiOperation(value = "密钥体配发-向下级配发列表")
@RequestMapping(path = "belowIssueList",method = RequestMethod.GET)
public R belowIssueList(@RequestBody @Valid SecretIssueSubordinateParam param, BindingResult bindingResult){
if (bindingResult.hasErrors()) {
return actionResultWithBindingResult(ErrorCodeEnum.BIND_EXCEPTION, bindingResult);
}
log.info("[start]向下级配发列表,param:{}",param);
PageInfo<SecretIssueSubordinate> pages = secretFormatService.belowIssueList(param);
log.info("[end]向下级配发列表,pages:{}",pages);
return R.ok().setData(pages);
}
@ApiOperation(value = "密钥体配发-密钥体邮箱任务列表")
@RequestMapping(path = "mailIssueList",method = RequestMethod.GET)
public R mailIssueList(@RequestBody @Valid SecretIssueMailboxParam param, BindingResult bindingResult){
if (bindingResult.hasErrors()) {
return actionResultWithBindingResult(ErrorCodeEnum.BIND_EXCEPTION, bindingResult);
}
log.info("[start]密钥体邮箱任务列表,param:{}",param);
PageInfo<SecretIssueMailbox> pages = secretFormatService.mailIssueList(param);
log.info("[end]密钥体邮箱任务列表,pages:{}",pages);
return R.ok().setData(pages);
}
// @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);
// secretFormatService.updateStatus(type, id);
// log.info("[end]修改密钥体状态");
// return R.ok();
// }

@ -9,8 +9,6 @@ import com.aliyuncs.utils.StringUtils;
import com.imitate.web.persistence.beans.ParameterSet;
import com.imitate.web.persistence.mapper.ParameterSetMapper;
import cn.hutool.core.date.DateUtil;
@Service
public class ParameterSetService {
@ -28,7 +26,7 @@ public class ParameterSetService {
parameterSet.setIpAddress("114.114.114.114");
}
parameterSet.setCreateTime(now);
return parameterSetMapper.insertSelective(dataTerminal);
return parameterSetMapper.insertSelective(parameterSet);
}else {
parameterSet.setUpdateTime(now);
return parameterSetMapper.updateByPrimaryKeySelective(parameterSet);

@ -3,6 +3,9 @@ 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;
@ -11,13 +14,21 @@ 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.params.SecretIssueMailboxParam;
import com.imitate.web.params.SecretIssueSubordinateParam;
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.beans.SecretIssueMailbox;
import com.imitate.web.persistence.beans.SecretIssuePrivate;
import com.imitate.web.persistence.beans.SecretIssueSubordinate;
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;
import com.imitate.web.persistence.mapper.SecretIssueMailboxMapper;
import com.imitate.web.persistence.mapper.SecretIssuePrivateMapper;
import com.imitate.web.persistence.mapper.SecretIssueSubordinateMapper;
@Service
public class SecretFormatService {
@ -35,6 +46,15 @@ public class SecretFormatService {
@Autowired
private SecretBodyAcceptanceMapper secretBodyAcceptanceMapper;
@Autowired
private SecretIssueSubordinateMapper secretIssueSubordinateMapper;
@Autowired
private SecretIssueMailboxMapper secretIssueMailboxMapper;
@Autowired
private SecretIssuePrivateMapper secretIssuePrivateMapper;
/**
*
@ -167,7 +187,7 @@ public class SecretFormatService {
/**
*
* -
* @param type 1. 2. 3.
* @param id
*/
@ -198,7 +218,7 @@ public class SecretFormatService {
/**
*
* -
* @param id id 使
*/
public void addSecretBodyAcceptance(Integer id){
@ -229,7 +249,7 @@ public class SecretFormatService {
/**
*
* -
* @param param
* @return
*/
@ -242,6 +262,107 @@ public class SecretFormatService {
/**
* -
* @return
*/
public PageInfo<SecretIssueSubordinate> belowIssueList(SecretIssueSubordinateParam param){
PageHelper.startPage(param.getPageNumber(), param.getPageSize());
List<SecretIssueSubordinate> list = secretIssueSubordinateMapper.selectAllByParam(param);
return new PageInfo<>(list);
}
/**
* -
* @param param
* @return
*/
public PageInfo<SecretIssueMailbox> mailIssueList(@Valid SecretIssueMailboxParam param) {
PageHelper.startPage(param.getPageNumber(), param.getPageSize());
List<SecretIssueMailbox> list = secretIssueMailboxMapper.selectAllByParam(param);
return new PageInfo<>(list);
}
/**
* - 1 2 3
* @param id
*/
public void issue(Integer type, Integer id) {
SecretImport secretImport = secretImportMapper.selectByPrimaryKey(id);
if (secretImport != null) {
secretImport.setCurrentStatus("已使用");
secretImportMapper.updateByPrimaryKeySelective(secretImport);
switch (type) {
case 1:
// 向下级配发
SecretIssueSubordinate secretIssueSubordinate = new SecretIssueSubordinate();
secretIssueSubordinate.setProductName(secretImport.getProductName());
secretIssueSubordinate.setProductNum(secretImport.getProductNum());
secretIssueSubordinate.setCarrierType(secretImport.getCarrierType());
secretIssueSubordinate.setApplyModel(secretImport.getApplyModel());
secretIssueSubordinate.setDistManagerName("配发管理系统名称");
secretIssueSubordinate.setDistManagerIdentifer("配发管理系统实体标识");
secretIssueSubordinate.setIssueNum(secretImport.getNumber());
secretIssueSubordinate.setIssueStatus("已配发");
secretIssueSubordinate.setDelNotes("删除标志");
secretIssueSubordinate.setSubOperateTime(LocalDateTime.now());
secretIssueSubordinate.setApplyManagerSysName("申请管理系统名称");
secretIssueSubordinate.setApplyManagerModelName("申请管理系统实体标识");
secretIssueSubordinate.setQuantity(secretImport.getApplyNum());
secretIssueSubordinate.setQuantityTime(LocalDateTime.now());
secretIssueSubordinate.setDistCode("配发编号");
secretIssueSubordinate.setApplyCode("申请编号");
secretIssueSubordinateMapper.insertSelective(secretIssueSubordinate);
break;
case 2:
// 向邮箱配发
SecretIssueMailbox secretIssueMailbox = new SecretIssueMailbox();
secretIssueMailbox.setKeyDistPlatformName("密钥分发平台名称");
secretIssueMailbox.setKeyDistPlatformEntity("密钥分发平台实体标识");
secretIssueMailbox.setProductName(secretImport.getProductName());
secretIssueMailbox.setProductCode(secretImport.getProductNum());
secretIssueMailbox.setApplyType(secretImport.getCarrierType());
secretIssueMailbox.setApplyModel(secretImport.getApplyModel());
secretIssueMailbox.setTotal(secretImport.getNumber());
secretIssueMailbox.setDownloadNum(35);
secretIssueMailbox.setEmpower("授权");
secretIssueMailbox.setPriority("优先级");
secretIssueMailbox.setOverTime(LocalDateTime.now());
secretIssueMailbox.setNotificationFlag("通知标志");
secretIssueMailbox.setDeleteFlag("删除标志");
secretIssueMailboxMapper.insertSelective(secretIssueMailbox);
break;
default:
// 向专用密码管理系统配发
SecretIssuePrivate secretIssuePrivate = new SecretIssuePrivate();
secretIssuePrivate.setProductName(secretImport.getProductName());
secretIssuePrivate.setProductCode(secretImport.getProductNum());
secretIssuePrivate.setIssueManagerSysName("配发管理系统名称");
secretIssuePrivate.setSyncStatus("已同步");
secretIssuePrivateMapper.insertSelective(secretIssuePrivate);
break;
}
}
}

@ -2,15 +2,20 @@ package com.imitate.web.params;
import java.io.Serializable;
import javax.validation.Valid;
import com.imitate.common.util.BasePageCondition;
import com.imitate.web.persistence.beans.SecretAsk;
import lombok.Data;
import lombok.experimental.Delegate;
@Data
public class SecretAskParam extends BasePageCondition implements Serializable{
@Valid
@Delegate
private SecretAsk secretAsk;

@ -2,14 +2,19 @@ package com.imitate.web.params;
import java.io.Serializable;
import javax.validation.Valid;
import com.imitate.common.util.BasePageCondition;
import com.imitate.web.persistence.beans.SecretBodyAcceptance;
import lombok.Data;
import lombok.experimental.Delegate;
@Data
public class SecretBodyAcceptanceParam extends BasePageCondition implements Serializable{
@Valid
@Delegate
private SecretBodyAcceptance secretBodyAcceptance;
{

@ -2,11 +2,13 @@ package com.imitate.web.params;
import java.io.Serializable;
import javax.validation.Valid;
import com.imitate.common.util.BasePageCondition;
import com.imitate.web.persistence.beans.SecretFormat;
import lombok.Data;
import lombok.experimental.Delegate;
@ -14,6 +16,8 @@ import lombok.Data;
public class SecretFormatParam extends BasePageCondition implements Serializable{
@Valid
@Delegate
private SecretFormat secretFormat;

@ -2,14 +2,19 @@ package com.imitate.web.params;
import java.io.Serializable;
import javax.validation.Valid;
import com.imitate.common.util.BasePageCondition;
import com.imitate.web.persistence.beans.SecretImport;
import lombok.Data;
import lombok.experimental.Delegate;
@Data
public class SecretImportParam extends BasePageCondition implements Serializable{
@Valid
@Delegate
private SecretImport secretImport;

@ -1,9 +1,12 @@
package com.imitate.web.params;
import javax.validation.Valid;
import com.imitate.common.util.BasePageCondition;
import com.imitate.web.persistence.beans.SecretInit;
import lombok.Data;
import lombok.experimental.Delegate;
@Data
public class SecretInitParam extends BasePageCondition implements Serializable{

@ -0,0 +1,25 @@
package com.imitate.web.params;
import java.io.Serializable;
import javax.validation.Valid;
import com.imitate.common.util.BasePageCondition;
import com.imitate.web.persistence.beans.SecretIssueMailbox;
import lombok.Data;
import lombok.experimental.Delegate;
@Data
public class SecretIssueMailboxParam extends BasePageCondition implements Serializable{
@Valid
@Delegate
private SecretIssueMailbox secretIssueMailbox;
{
this.secretIssueMailbox = new SecretIssueMailbox();
}
}

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

@ -1,8 +1,6 @@
package com.imitate.web.persistence.beans;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
import javax.persistence.Table;

@ -0,0 +1,32 @@
package com.imitate.web.persistence.beans;
import java.time.LocalDateTime;
import javax.persistence.Table;
import com.imitate.common.util.AbstractDO;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@Table(name = "secret_issue_mailbox")
public class SecretIssueMailbox extends AbstractDO{
private String keyDistPlatformName;
private String keyDistPlatformEntity;
private String productName;
private String productCode;
private String applyType;
private String applyModel;
private Integer total;
private Integer downloadNum;
private String empower;
private String priority;
private LocalDateTime overTime;
private String notificationFlag;
private String deleteFlag;
}

@ -1,6 +1,6 @@
package com.imitate.web.persistence.beans;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
import javax.persistence.Table;
@ -36,15 +36,15 @@ public class SecretIssueSubordinate extends AbstractDO {
private String delNotes;
private Date subOperateTime;
private LocalDateTime subOperateTime;
private String applyManagerSysName;
private String applyManagerModelName;
private String quantity;
private Integer quantity;
private Date quantityTime;
private LocalDateTime quantityTime;
private String distCode;

@ -0,0 +1,22 @@
package com.imitate.web.persistence.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
import com.imitate.common.util.BaseMapper;
import com.imitate.web.params.SecretIssueMailboxParam;
import com.imitate.web.persistence.beans.SecretIssueMailbox;
@Mapper
@Repository
public interface SecretIssueMailboxMapper extends BaseMapper<SecretIssueMailbox>{
List<SecretIssueMailbox> selectAllByParam(SecretIssueMailboxParam param);
}

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

@ -0,0 +1,51 @@
<?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.imitate.web.persistence.mapper.SecretIssueMailboxMapper" >
<resultMap id="BaseResultMap" type="com.imitate.web.persistence.beans.SecretIssueMailbox" >
<id column="id" property="id" jdbcType="INTEGER" />
<result column="key_dist_platform_name" property="keyDistPlatformName" jdbcType="VARCHAR" />
<result column="key_dist_platform_entity" property="keyDistPlatformEntity" jdbcType="VARCHAR" />
<result column="product_name" property="productName" jdbcType="VARCHAR" />
<result column="product_code" property="productCode" jdbcType="VARCHAR" />
<result column="apply_model" property="apply_type" jdbcType="VARCHAR" />
<result column="total" property="total" jdbcType="INTEGER" />
<result column="download_num" property="downloadNum" jdbcType="INTEGER" />
<result column="empower" property="empower" jdbcType="VARCHAR" />
<result column="priority" property="issueStatus" jdbcType="VARCHAR" />
<result column="over_time" property="overTime" jdbcType="VARCHAR" />
<result column="notification_flag" property="notificationFlag" jdbcType="VARCHAR" />
<result column="delete_flag" property="deleteFlag" jdbcType="VARCHAR" />
<result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
</resultMap>
<select id="selectAllByParam" resultMap="BaseResultMap">
SELECT
a.id, a.key_dist_platform_name, a.key_dist_platform_entity, a.carrier_type, a.apply_model, a.dist_manager_name, a.dist_manager_identifer, a.issue_num,a.issue_status,a.del_notes,a.sub_operate_time,a.apply_manager_sys_name,a.apply_manager_model_name,a.quantity,
a.quantity_time,a.dist_code,a.apply_code,
a.create_time,a.update_time
FROM
secret_issue_subordinate a
WHERE 1=1
<if test="param.productName !=null and param.productName !=''">
AND a.product_name = #{param.productName}
</if>
<if test="param.productNum !=null and param.productNum !=''">
AND a.product_num = #{param.productNum}
</if>
<if test="param.carrierType !=null and param.carrierType !=''">
AND a.carrier_type = #{param.carrierType}
</if>
<if test="param.applyModel !=null and param.applyModel !=''">
AND a.apply_model = #{param.applyModel}
</if>
<if test="param.issueNum !=null and param.issueNum !=''">
AND a.issue_num = #{param.issueNum}
</if>
</select>
</mapper>

@ -16,7 +16,7 @@
<result column="sub_operate_time" property="subOperateTime" jdbcType="TIMESTAMP" />
<result column="apply_manager_sys_name" property="applyManagerSysName" jdbcType="VARCHAR" />
<result column="apply_manager_model_name" property="applyManagerModelName" jdbcType="VARCHAR" />
<result column="quantity" property="quantity" jdbcType="VARCHAR" />
<result column="quantity" property="quantity" jdbcType="INTEGER" />
<result column="quantity_time" property="quantityTime" jdbcType="TIMESTAMP" />
<result column="dist_code" property="distCode" jdbcType="VARCHAR" />
<result column="apply_code" property="applyCode" jdbcType="VARCHAR" />
@ -24,4 +24,33 @@
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
</resultMap>
<select id="selectAllByParam" resultMap="BaseResultMap">
SELECT
a.id, a.product_name, a.product_num, a.carrier_type, a.apply_model, a.dist_manager_name, a.dist_manager_identifer, a.issue_num,a.issue_status,a.del_notes,a.sub_operate_time,a.apply_manager_sys_name,a.apply_manager_model_name,a.quantity,
a.quantity_time,a.dist_code,a.apply_code,
a.create_time,a.update_time
FROM
secret_issue_subordinate a
WHERE 1=1
<if test="param.productName !=null and param.productName !=''">
AND a.product_name = #{param.productName}
</if>
<if test="param.productNum !=null and param.productNum !=''">
AND a.product_num = #{param.productNum}
</if>
<if test="param.carrierType !=null and param.carrierType !=''">
AND a.carrier_type = #{param.carrierType}
</if>
<if test="param.applyModel !=null and param.applyModel !=''">
AND a.apply_model = #{param.applyModel}
</if>
<if test="param.issueNum !=null and param.issueNum !=''">
AND a.issue_num = #{param.issueNum}
</if>
</select>
</mapper>
Loading…
Cancel
Save