From 98250a7cff913563152ae8b313c7f45cc27545ba Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期四, 27 二月 2025 09:13:50 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 34 +++++++++++++++++++++++++++------- 1 files changed, 27 insertions(+), 7 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java index 5d6d27b..38577a8 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java @@ -8,6 +8,7 @@ import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; +import com.doumee.dao.business.dao.UserActionMapper; import com.doumee.service.business.third.model.LoginUserInfo; import com.doumee.service.business.third.model.PageData; import com.doumee.service.business.third.model.PageWrap; @@ -34,7 +35,6 @@ import com.doumee.service.business.third.EmayService; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.commons.lang3.StringUtils; -import org.checkerframework.checker.units.qual.C; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -71,6 +71,8 @@ @Autowired private HiddenDangerLogMapper hiddenDangerLogMapper; + @Autowired + private UserActionMapper userActionMapper; @Autowired @@ -255,20 +257,21 @@ if(Objects.isNull(model)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌闅愭偅鏁版嵁"); } - if (!Constants.equalsInteger(model.getStatus(),Constants.ZERO)) { + /* if (!Constants.equalsInteger(model.getStatus(),Constants.ZERO)) { throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�佸凡娴佽浆,璇峰埛鏂版煡鐪�!"); - } + }*/ HiddenDanger hiddenDanger = new HiddenDanger(); hiddenDanger.setIsdeleted(Constants.ONE); hiddenDanger.setId(id); hiddenDanger.setEditor(user.getId()); + Date date =new Date(); - hiddenDanger.setEditDate(new Date()); + hiddenDanger.setEditDate(date); hiddenDangerMapper.updateById(hiddenDanger); //瀛樺偍 鎿嶄綔鏃ュ織 HiddenDangerLog hiddenDangerLog = new HiddenDangerLog(); hiddenDangerLog.setIsdeleted(Constants.ZERO); - hiddenDangerLog.setCreateDate(new Date()); + hiddenDangerLog.setCreateDate(date); hiddenDangerLog.setCreator(hiddenDanger.getEditor()); hiddenDangerLog.setEditDate(hiddenDangerLog.getCreateDate()); hiddenDangerLog.setEditor(hiddenDanger.getCreator()); @@ -276,6 +279,13 @@ hiddenDangerLog.setHiddenDangerId(hiddenDanger.getId()); hiddenDangerLog.setObjType(Constants.FIVE); hiddenDangerLogMapper.insert(hiddenDangerLog); + + String[] params = new String[3]; + params[0] = user.getRealname(); + params[1]=DateUtil.getPlusTime2(date); + params[2]=model.getAreaName()+"-銆�"+model.getContent()+"銆�"; + //璁板綍鍒犻櫎鏃ュ織 + UserActionServiceImpl.saveUserActionBiz(user,id,Constants.UserActionType.HIDEN_DANGER_DEL,userActionMapper,date,params,JSONObject.toJSONString(model)); } @Override @@ -403,6 +413,7 @@ IPage<HiddenDanger> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); MPJLambdaWrapper<HiddenDanger> queryWrapper = new MPJLambdaWrapper<>(); Utils.MP.blankToNull(pageWrap.getModel()); + pageWrap.getModel().setIsdeleted(Constants.ZERO); queryWrapper.selectAll(HiddenDanger.class) .selectAs(HiddenDangerParam::getName,HiddenDanger::getCategoryName) .select("t1.name", HiddenDanger::getMemberName) @@ -505,12 +516,20 @@ .lambda() .set(Notices::getReaded,Constants.ONE) .set(Notices::getStatus,Constants.ONE) + .set(Notices::getInfo,hiddenDanger.getStatus().equals(Constants.ONE)?"宸叉暣鏀�":"宸查��鍥�") .set(Notices::getParam2,hiddenDanger.getStatus()) .set(Notices::getParam4,hiddenDanger.getLoginUserInfo().getMemberId()) .eq(Notices::getObjId,hiddenDanger.getId()) .eq(Notices::getObjType,Constants.THREE) - .eq(Notices::getUserId,hiddenDanger.getLoginUserInfo().getMemberId()) - ); + .eq(Notices::getUserId,hiddenDanger.getLoginUserInfo().getMemberId())); + //鍙戣捣浜轰唬鍔炴爣棰樹慨鏀逛负澶勭悊缁撴灉 + noticesJoinMapper.update(null,new UpdateWrapper<Notices>() + .lambda() + .set(Notices::getInfo,hiddenDanger.getStatus().equals(Constants.ONE)?"宸叉暣鏀�":"宸查��鍥�") + .set(Notices::getParam2,hiddenDanger.getStatus()) + .eq(Notices::getObjId,hiddenDanger.getId()) + .eq(Notices::getObjType,Constants.THREE) + .eq(Notices::getParam3,hiddenDanger.getMemberId().toString()) ); SystemUser memberUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda() .eq(SystemUser::getDeleted, Constants.ZERO) @@ -561,6 +580,7 @@ if(!(hiddenDanger.getStatus().equals(Constants.ONE)||hiddenDanger.getStatus().equals(Constants.TWO))){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀敊璇�,璇峰埛鏂版煡鐪嬶紒"); } + hiddenDanger.setMemberId(model.getMemberId());//鍙戣捣浜� } private void dealFileBiz(HiddenDanger hiddenDanger) {//鏁存敼鍓嶆枃浠� -- Gitblit v1.9.3