最新版本541200007

jiangping

2025-02-26 21ffb032824db3c392f63d318d36efee33326b80

 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;
@@ -70,6 +71,8 @@

    @Autowired
    private HiddenDangerLogMapper hiddenDangerLogMapper;
    @Autowired
    private UserActionMapper userActionMapper;


    @Autowired
@@ -239,6 +242,51 @@
    public void deleteById(Integer id) {
        hiddenDangerMapper.deleteById(id);
    }
    @Override
    public void deleteById(Integer id,LoginUserInfo user) {
        if( Objects.isNull(id)   ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        HiddenDanger model = hiddenDangerMapper.selectJoinOne(HiddenDanger.class,new MPJLambdaWrapper<HiddenDanger>()
                .selectAll(HiddenDanger.class)
                .selectAs(Member::getName,HiddenDanger::getCheckorName)
                .leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
                .eq(HiddenDanger::getId,id)
                .eq(HiddenDanger::getIsdeleted,Constants.ZERO)
        );
        if(Objects.isNull(model)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到隐患数据");
        }
       /* 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(date);
        hiddenDangerMapper.updateById(hiddenDanger);
        //存储 操作日志
        HiddenDangerLog hiddenDangerLog = new HiddenDangerLog();
        hiddenDangerLog.setIsdeleted(Constants.ZERO);
        hiddenDangerLog.setCreateDate(date);
        hiddenDangerLog.setCreator(hiddenDanger.getEditor());
        hiddenDangerLog.setEditDate(hiddenDangerLog.getCreateDate());
        hiddenDangerLog.setEditor(hiddenDanger.getCreator());
        hiddenDangerLog.setTitle("由【"+user.getRealname()+"】删除记录");
        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
    public void delete(HiddenDanger hiddenDanger) {
@@ -312,6 +360,17 @@
                if(StringUtils.isBlank(f.getFileurl())){
                    continue;
                }
                if(f.getType() == null){
                    if(StringUtils.endsWithIgnoreCase(f.getFileurl(),".mp4")){
                        f.setType(Constants.ONE);
                    }else if(StringUtils.endsWithIgnoreCase(f.getFileurl(),".jpg")
                            ||StringUtils.endsWithIgnoreCase(f.getFileurl(),".jpeg")
                            ||StringUtils.endsWithIgnoreCase(f.getFileurl(),".png")){
                        f.setType(Constants.ZERO);
                    }else{
                        f.setType(Constants.TWO);
                    }
                }
                f.setFileurlFull(path+f.getFileurl());
                if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.HIDDEN_DANGER_SUBMIT.getKey())){
                    //现场情况
@@ -354,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)
@@ -456,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)
@@ -512,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) {//整改前文件
@@ -529,6 +598,17 @@
                multifile.setCreateDate(new Date());
                multifile.setCreator(hiddenDanger.getEditor());
                multifile.setIsdeleted(Constants.ZERO);
                if(multifile.getType() == null){
                    if(StringUtils.endsWithIgnoreCase(multifile.getFileurl(),".mp4")){
                        multifile.setType(Constants.ONE);
                    }else if(StringUtils.endsWithIgnoreCase(multifile.getFileurl(),".jpg")
                    ||StringUtils.endsWithIgnoreCase(multifile.getFileurl(),".jpeg")
                    ||StringUtils.endsWithIgnoreCase(multifile.getFileurl(),".png")){
                        multifile.setType(Constants.ZERO);
                    }else{
                        multifile.setType(Constants.TWO);
                    }
                }
                multifile.setObjId(hiddenDanger.getId());
                multifile.setCreator(hiddenDanger.getLoginUserInfo().getId());
                multifile.setObjType(Constants.MultiFile.HIDDEN_DANGER_DEAL_BEFORE.getKey());
@@ -542,7 +622,7 @@
            multifileMapper.update(null,new UpdateWrapper<Multifile>().lambda()
                    .set(Multifile::getIsdeleted,Constants.ONE )
                    .eq(Multifile::getObjType,Constants.MultiFile.HIDDEN_DANGER_DEAL_BEFORE.getKey())
                    .set(Multifile::getObjId,hiddenDanger.getId())
                    .eq(Multifile::getObjId,hiddenDanger.getId())
            );
        }
        if(hiddenDanger.getStatus().equals(Constants.ONE)){