From 9bce48a9f30f7d80c43f43f46d40df20fcb00e15 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期五, 03 二月 2023 09:39:59 +0800 Subject: [PATCH] 1 --- src/main/java/com/lf/server/service/show/ApplyService.java | 84 +++++++++++++++++++++++++++++++++++------- 1 files changed, 70 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/lf/server/service/show/ApplyService.java b/src/main/java/com/lf/server/service/show/ApplyService.java index e916120..28ad5ac 100644 --- a/src/main/java/com/lf/server/service/show/ApplyService.java +++ b/src/main/java/com/lf/server/service/show/ApplyService.java @@ -4,14 +4,17 @@ import com.lf.server.entity.show.ApplyEntity; import com.lf.server.entity.show.FlowEntity; import com.lf.server.entity.sys.UserEntity; -import com.lf.server.helper.Md5Helper; +import com.lf.server.helper.AesHelper; import com.lf.server.helper.StringHelper; import com.lf.server.mapper.show.ApplyMapper; -import org.hsqldb.rights.User; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.sql.Timestamp; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -26,14 +29,23 @@ @Autowired FlowService flowService; + @Autowired + DataLibService dataLibService; + + private final static Log log = LogFactory.getLog(ApplyService.class); + @Override - public Integer selectCount(Integer userid) { - return applyMapper.selectCount(userid); + public Integer selectCount(String uname, Integer status, Timestamp start, Timestamp end) { + uname = StringHelper.getLikeStr(uname); + + return applyMapper.selectCount(uname, status, start, end); } @Override - public List<ApplyEntity> selectByPage(Integer userid, Integer limit, Integer offset) { - return applyMapper.selectByPage(userid, limit, offset); + public List<ApplyEntity> selectByPage(Integer userid, String uname, Integer status, Timestamp start, Timestamp end, Integer limit, Integer offset) { + uname = StringHelper.getLikeStr(uname); + + return applyMapper.selectByPage(userid, uname, status, start, end, limit, offset); } @Override @@ -44,6 +56,21 @@ @Override public ApplyEntity selectById(int id) { return applyMapper.selectById(id); + } + + @Override + public UserEntity selectUserByDepid(Integer depid) { + return applyMapper.selectUserByDepid(depid); + } + + @Override + public Integer selectSubmits(Integer userid) { + return applyMapper.selectSubmits(userid); + } + + @Override + public List<FlowEntity> selectFlows(Integer applyid) { + return applyMapper.selectFlows(applyid); } @Override @@ -76,10 +103,30 @@ return applyMapper.updates(list); } + @Override + public Integer updateForDiscard(Integer userid, Integer id) { + return applyMapper.updateForDiscard(userid, id); + } + + @Override + public Integer updateForResubmit(Integer userid, Integer id) { + return applyMapper.updateForResubmit(userid, id); + } + + @Override + public Integer updateForSubmit(Integer userid, Integer applyid, Integer flowId) { + return applyMapper.updateForSubmit(userid, applyid, flowId); + } + + @Override + public Integer updateForReject(Integer userid, Integer applyid, Integer flowId) { + return applyMapper.updateForReject(userid, applyid, flowId); + } + /** * 鎻掑叆鏁版嵁鐢宠 */ - public Integer insertApply(UserEntity ue, DownloadReqEntity dr) { + public Integer insertApply(UserEntity ue, DownloadReqEntity dr) throws Exception { ApplyEntity apply = getApplyEntity(ue, dr); int rows = applyMapper.insert(apply); if (0 == rows) { @@ -95,8 +142,9 @@ /** * 鑾峰彇鏁版嵁鐢宠瀹炰綋绫� */ - private ApplyEntity getApplyEntity(UserEntity ue, DownloadReqEntity dr) { - String dbPwd = Md5Helper.reverse(Md5Helper.generate(dr.getPwd())); + private ApplyEntity getApplyEntity(UserEntity ue, DownloadReqEntity dr) throws Exception { + // String dbPwd = Md5Helper.reverse(Md5Helper.generate(dr.getPwd())) + String aesPwd = AesHelper.encrypt(dr.getPwd()); ApplyEntity apply = new ApplyEntity(); apply.setUserid(ue.getId()); @@ -104,7 +152,7 @@ apply.setTabs(StringHelper.join(dr.getTabs(), ",")); apply.setEntities(StringHelper.join(dr.getEntities(), ",")); apply.setWkt(dr.getWkt()); - apply.setPwd(dbPwd); + apply.setPwd(aesPwd); apply.setStatus(0); apply.setCount(dr.getIds().size()); apply.setDescr(dr.getDescr()); @@ -120,6 +168,9 @@ List<FlowEntity> list = new ArrayList<>(); for (Integer depid : dr.getIds()) { UserEntity user = selectUserByDepid(depid); + if (null == user) { + continue; + } FlowEntity flow = new FlowEntity(); flow.setApplyid(applyId); @@ -136,11 +187,16 @@ } /** - * 鏍规嵁鍗曚綅ID鏌ヨ鐢ㄦ埛 + * 鎵撳寘DB鏁版嵁 */ - private UserEntity selectUserByDepid(Integer depid) { - // + public void zipDbData(UserEntity ue, ApplyEntity entity) { + try { + List<String> entities = Arrays.asList(entity.getEntities().split(",")); + String pwd = AesHelper.decrypt(entity.getPwd()); - return null; + dataLibService.createZipFile(ue, entities, entity.getWkt(), pwd); + } catch (Exception ex) { + log.error(ex.getMessage(), ex); + } } } -- Gitblit v1.9.3