Merge remote-tracking branch 'remotes/origin/dev' into release

5 years ago · bde87d91c0
5 changed files with 149 additions and 105 deletions
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeCustomerDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeCustomerDao.java
@ -47,38 +47,51 @@ public interface CodeCustomerDao extends BaseDao<CodeCustomerEntity> {
 	 */
 	List<UploadListResultDTO> selectCodeList(UploadListFormDTO formDTO);

-    /**
-     * @Description  根据客户id和客户端类型获取 代码模板ID和授权方AppId
-     * @param customerId
-     * @param clientType
-     * @author zxc
-     */
-    TemplateAndAppIdResultDTO selectTemplateAndAppId(@Param("customerId")String customerId,@Param("clientType")String clientType);
+	/**
+	 * @param customerId
+	 * @param clientType
+	 * @Description 根据客户id和客户端类型获取 代码模板ID和授权方AppId
+	 * @author zxc
+	 */
+	TemplateAndAppIdResultDTO selectTemplateAndAppId(@Param("customerId") String customerId, @Param("clientType") String clientType);

-    /**
-     * @Description  查询 code_customer 表ID
-     * @param codeAuditRecord
-     * @author zxc
-     */
-    String selectCodeCustomerId(CodeAuditRecordFormDTO codeAuditRecord);
+	/**
+	 * @param codeAuditRecord
+	 * @Description 查询 code_customer 表ID
+	 * @author zxc
+	 */
+	String selectCodeCustomerId(CodeAuditRecordFormDTO codeAuditRecord);

-    /**
-     * 删除旧的上传记录
-     * @author zhaoqifeng
-     * @date 2020/7/15 18:06
-     * @param customerId
-     * @param clientType
-     * @return void
-     */
-    void deleteCode(@Param("customerId") String customerId, @Param("clientType") String clientType);
+	/**
+	 * 删除旧的上传记录
+	 *
+	 * @param customerId
+	 * @param clientType
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2020/7/15 18:06
+	 */
+	void deleteCode(@Param("customerId") String customerId, @Param("clientType") String clientType);

-    /**
-     * 获取审核中代码列表
-     * @author zhaoqifeng
-     * @date 2020/7/15 18:17
-     * @param source
-     * @return java.util.List<com.epmet.dto.CodeCustomerDTO>
-     */
-    List<CodeCustomerDTO> selectAuditingCodeList(@Param("source") String source);
+	/**
+	 * 获取审核中代码列表
+	 *
+	 * @param source
+	 * @return java.util.List<com.epmet.dto.CodeCustomerDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/7/15 18:17
+	 */
+	List<CodeCustomerDTO> selectAuditingCodeList(@Param("source") String source);
+
+	/**
+	 * 获取上传代码信息
+	 *
+	 * @param customerId
+	 * @param clientType
+	 * @return com.epmet.dto.CodeCustomerDTO
+	 * @author zhaoqifeng
+	 * @date 2020/7/31 15:54
+	 */
+	CodeCustomerDTO selectUploadCodeByCustomer(@Param("customerId") String customerId, @Param("clientType") String clientType);

 }
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeCustomerService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeCustomerService.java
@ -112,6 +112,16 @@ public interface CodeCustomerService extends BaseService<CodeCustomerEntity> {
     */
    List<CodeCustomerDTO> getAuditingCodeList(String source);

+    /**
+     * 获取上传代码信息
+     * @author zhaoqifeng
+     * @date 2020/7/31 15:52
+     * @param customerId
+     * @param clientType
+     * @return com.epmet.dto.CodeCustomerDTO
+     */
+    CodeCustomerDTO getUploadCodeByCustomer(String customerId, String clientType);
+
    /**
     * 删除旧代码记录
     * @author zhaoqifeng
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeCustomerServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeCustomerServiceImpl.java
@ -50,79 +50,84 @@ import java.util.Map;
@Service
 public class CodeCustomerServiceImpl extends BaseServiceImpl<CodeCustomerDao, CodeCustomerEntity> implements CodeCustomerService {

-    @Autowired
-    private CodeCustomerRedis codeCustomerRedis;
-
-    @Override
-    public PageData<CodeCustomerDTO> page(Map<String, Object> params) {
-        IPage<CodeCustomerEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, CodeCustomerDTO.class);
-    }
-
-    @Override
-    public List<CodeCustomerDTO> list(Map<String, Object> params) {
-        List<CodeCustomerEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, CodeCustomerDTO.class);
-    }
-
-    private QueryWrapper<CodeCustomerEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<CodeCustomerEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public CodeCustomerDTO get(String id) {
-        CodeCustomerEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, CodeCustomerDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public String save(CodeCustomerDTO dto) {
-        CodeCustomerEntity entity = ConvertUtils.sourceToTarget(dto, CodeCustomerEntity.class);
-        insert(entity);
-        return entity.getId();
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(CodeCustomerDTO dto) {
-        CodeCustomerEntity entity = ConvertUtils.sourceToTarget(dto, CodeCustomerEntity.class);
-        updateById(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
-    }
-
-    @Override
-    public PageData getCodeList(UploadListFormDTO formDTO) {
-        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
-        List<UploadListResultDTO> list = baseDao.selectCodeList(formDTO);
-        PageInfo<UploadListResultDTO> pageInfo = new PageInfo<>(list);
-        return new PageData<>(list, pageInfo.getTotal());
-    }
-
-    @Override
-    public List<CodeCustomerDTO> getAuditingCodeList(String source) {
-        return baseDao.selectAuditingCodeList(source);
-    }
-
-    @Override
-    public void deleteCode(String customerId, String clientType) {
-        baseDao.deleteCode(customerId, clientType);
-    }
+	@Autowired
+	private CodeCustomerRedis codeCustomerRedis;
+
+	@Override
+	public PageData<CodeCustomerDTO> page(Map<String, Object> params) {
+		IPage<CodeCustomerEntity> page = baseDao.selectPage(
+				getPage(params, FieldConstant.CREATED_TIME, false),
+				getWrapper(params)
+		);
+		return getPageData(page, CodeCustomerDTO.class);
+	}
+
+	@Override
+	public List<CodeCustomerDTO> list(Map<String, Object> params) {
+		List<CodeCustomerEntity> entityList = baseDao.selectList(getWrapper(params));
+
+		return ConvertUtils.sourceToTarget(entityList, CodeCustomerDTO.class);
+	}
+
+	private QueryWrapper<CodeCustomerEntity> getWrapper(Map<String, Object> params) {
+		String id = (String) params.get(FieldConstant.ID_HUMP);
+
+		QueryWrapper<CodeCustomerEntity> wrapper = new QueryWrapper<>();
+		wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+		return wrapper;
+	}
+
+	@Override
+	public CodeCustomerDTO get(String id) {
+		CodeCustomerEntity entity = baseDao.selectById(id);
+		return ConvertUtils.sourceToTarget(entity, CodeCustomerDTO.class);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public String save(CodeCustomerDTO dto) {
+		CodeCustomerEntity entity = ConvertUtils.sourceToTarget(dto, CodeCustomerEntity.class);
+		insert(entity);
+		return entity.getId();
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void update(CodeCustomerDTO dto) {
+		CodeCustomerEntity entity = ConvertUtils.sourceToTarget(dto, CodeCustomerEntity.class);
+		updateById(entity);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void delete(String[] ids) {
+		// 逻辑删除（@TableLogic 注解）
+		baseDao.deleteBatchIds(Arrays.asList(ids));
+	}
+
+	@Override
+	public PageData getCodeList(UploadListFormDTO formDTO) {
+		PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
+		List<UploadListResultDTO> list = baseDao.selectCodeList(formDTO);
+		PageInfo<UploadListResultDTO> pageInfo = new PageInfo<>(list);
+		return new PageData<>(list, pageInfo.getTotal());
+	}
+
+	@Override
+	public List<CodeCustomerDTO> getAuditingCodeList(String source) {
+		return baseDao.selectAuditingCodeList(source);
+	}
+
+	@Override
+	public CodeCustomerDTO getUploadCodeByCustomer(String customerId, String clientType) {
+		return baseDao.selectUploadCodeByCustomer(customerId, clientType);
+	}
+
+	@Override
+	public void deleteCode(String customerId, String clientType) {
+		baseDao.deleteCode(customerId, clientType);
+	}


 }
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java
@ -107,6 +107,13 @@ public class CodeServiceImpl implements CodeService {
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void upload(CodeUploadFormDTO formDTO) {
+		//获取上传代码信息
+		CodeCustomerDTO uploadCode = codeCustomerService.getUploadCodeByCustomer(formDTO.getCustomerId(), formDTO.getClientType());
+		if (null != uploadCode) {
+			if (CodeConstant.AUDITING.equals(uploadCode.getStatus())) {
+				throw new RenException("已经有正在审核的版本,请等待审核完毕或者撤回审核后再上传");
+			}
+		}
 		//是否授权
 		if (!customerMpService.getAuthFlag(formDTO.getCustomerId(), formDTO.getClientType())) {
 			throw new RenException("未授权");
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeCustomerDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeCustomerDao.xml
@ -88,6 +88,15 @@
    <select id="selectAuditingCodeList" resultType="com.epmet.dto.CodeCustomerDTO">
        select * FROM code_customer WHERE DEL_FLAG = '0' AND STATUS = 'auditing' AND SOURCE = #{source}
    </select>
+    <select id="selectUploadCodeByCustomer" resultType="com.epmet.dto.CodeCustomerDTO">
+        SELECT
+            ID, STATUS
+        FROM
+            code_customer
+        WHERE CUSTOMER_ID = #{customerId}
+           AND CLIENT_TYPE = #{clientType}
+           AND DEL_FLAG = '0'
+    </select>
    <update id="deleteCode">
        UPDATE code_customer
        SET