Merge remote-tracking branch 'origin/jtdev' into jtdev

gonglilong

2024-08-26 2c89f5c73fb364f2510d9fb4c8407395b4f959f4

Merge remote-tracking branch 'origin/jtdev' into jtdev

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgStepReportVO.java

@@ -13,4 +13,5 @@
private String     stepNum;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date reportTime;
private Integer resubmit;
}

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztods/entity/WaterDataTermites.java

New file
@@ -0,0 +1,28 @@
package cn.gistack.sm.sjztods.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@TableName("\"water_data_termites\"")
@ApiModel(value = "白蚁监测数据表", description = "白蚁监测数据表")
public class WaterDataTermites {

    /**
     * 白蚁蚁情状态
     */
    @ApiModelProperty(value = "白蚁蚁情状态 白蚁蚁情状态,有白蚁入侵为1")
    @TableField("\"status\"")
    private Integer status;

    /**
     * 设备id
     */
    @ApiModelProperty(value = "设备id")
    @TableField("\"device_id\"")
    private Integer deviceId;

}

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztods/vo/WaterDataTermitesVO.java

New file
@@ -0,0 +1,12 @@
package cn.gistack.sm.sjztods.vo;

import cn.gistack.sm.sjztods.entity.WaterDataTermites;
import lombok.Data;

@Data
public class WaterDataTermitesVO extends WaterDataTermites {

    private String startTime;
    private String endTime;

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml

@@ -148,7 +148,8 @@
            step.gx_step_name AS stepName,
            step.gx_step_num AS stepNum,
            re.STATUS AS approvalStatus,
            re.report_time
            re.report_time,
            re.resubmit
        FROM
            ywxt.sg_gx_step step
                LEFT JOIN ywxt.sg_gx gx ON step.gx_info_id = gx.id

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java

@@ -124,7 +124,7 @@

        if (sgProgressReportDOS1!= null && sgProgressReportDOS1.size() > 0) {
            for (SgProgressReportDO sgProgressReportDO1 : sgProgressReportDOS1) {
                if (sgProgressReportDO1.getStatus()!= 2) {
                if (sgProgressReportDO1.getStatus()!= 2 && sgProgressReportDO1.getStatus()!= 3)  {
                    throw new ServiceException("请先完成施工准备的审批!");
                }
            }
@@ -136,14 +136,23 @@
        SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId);
        List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(sgGxStepDO.getGxInfoId());
        QueryWrapper<SgProgressReportDO> wrapper = new QueryWrapper<>();
        wrapper.in("status",Arrays.asList(0,1,2));
        wrapper.in("status",Arrays.asList(0,1,2,3));
        if(sgProgressReportDO.getGxDeviceId()==998 || sgProgressReportDO.getGxDeviceId()==999){
            wrapper.eq("gx_step_id", gxStepId).eq("gx_device_id",gxDeviceId).ne("status",4).eq("profram_id",sgProgressReportDO.getProframId());
        }else {
            wrapper.eq("gx_step_id", gxStepId).eq("gx_device_id",gxDeviceId).ne("status",4);
        }
        List<SgProgressReportDO> sgProgressReportDOS = sgProgressReportMapper.selectList(wrapper);
        if ( sgProgressReportDOS!=null && sgProgressReportDOS.size()>0){

        if (CollectionUtils.isNotEmpty(sgProgressReportDOS)){
            for (SgProgressReportDO reportDO : sgProgressReportDOS) {
                if (reportDO.getStatus()==3 && reportDO.getResubmit()!=null && reportDO.getResubmit()==0){
                    throw new ServiceException("此工序已存在审批！");
                }
            }
        }
        List<SgProgressReportDO> reportDOS = sgProgressReportDOS.stream().filter(s -> s.getStatus() != 3).collect(Collectors.toList());
        if ( reportDOS!=null && reportDOS.size()>0){
            throw new ServiceException("此工序已存在审批！");
        }
        for (SgGxStepDO gxStepDO : list) {
@@ -234,6 +243,7 @@
        }
        sgProgressReportVO.setSgReportUserDOS(list);
        List<SgStepReportVO> sgStepReportVOS = sgProgressReportMapper.selectByDeviceId(sgProgressReportVO.getGxDeviceId());
        sgStepReportVOS = sgStepReportVOS.stream().filter(s -> s.getApprovalStatus() == null || (s.getApprovalStatus() != 4 && !(s.getApprovalStatus() == 3 && s.getResubmit() != 0))).collect(Collectors.toList());
        sgProgressReportVO.setSgStepReportVOS(sgStepReportVOS);
        return sgProgressReportVO;
    }

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java

@@ -54,13 +54,13 @@
    @Override
    public IPage<SgProjectInfoDO> queryPageList(IPage<SgProjectInfoDO> page, ProjectSearchDTO searchDTO) {
        List<SgProjectInfoDO> sgProjectInfoDOS = baseMapper.queryPageList(page,searchDTO);
        /*List<SgProjectInfoDO> projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
        List<SgProjectInfoDO> projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
        if (CollectionUtils.isNotEmpty(projectProgress)){
            Map<Long, String> progressMap = projectProgress.stream().filter(s->s.getProjectProgress()!=null).collect(Collectors.toMap(SgProjectInfoDO::getId, SgProjectInfoDO::getProjectProgress));
            sgProjectInfoDOS.forEach(s->{
                s.setProjectProgress(progressMap.get(s.getId()));
            });
        }*/
        }
        return page.setRecords(sgProjectInfoDOS);
    }

@@ -131,7 +131,7 @@
                        SgDeviceDO sgDeviceDO = new SgDeviceDO();
                        sgDeviceDO.setId(dId);
                        sgDeviceDO.setDeviceName(deList.get(0).getDeviceName());
                        List<SgGxStepDO> stepDOS = deList.stream().filter(s->s.getReportStatus()==null || (s.getReportStatus()!=4 &&(s.getReportStatus()==3 && s.getResubmit()==0))).map(s -> SgGxStepDO.builder().id(s.getStepId()).gxStepNum(s.getGxStepNum()).gxStepName(s.getGxStepName()).deviceId(s.getDId()).approvalStatus(s.getReportStatus()).build()).collect(Collectors.toList());
                        List<SgGxStepDO> stepDOS = deList.stream().filter(s -> s.getReportStatus() == null || (s.getReportStatus() != 4 && !(s.getReportStatus() == 3 && s.getResubmit() != 0))).map(s -> SgGxStepDO.builder().id(s.getStepId()).gxStepNum(s.getGxStepNum()).gxStepName(s.getGxStepName()).deviceId(s.getDId()).approvalStatus(s.getReportStatus()).build()).collect(Collectors.toList());
                        List<SgGxStepDO> stepOver = stepDOS.stream().filter(s -> s.getApprovalStatus() != null && s.getApprovalStatus() == 2).collect(Collectors.toList());
                        BigDecimal stepSize = BigDecimal.valueOf(stepDOS.size());
                        BigDecimal stepOverSize = BigDecimal.ZERO;

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/controller/WaterDataTermitesController.java

New file
@@ -0,0 +1,47 @@
package cn.gistack.sm.sjztods.controller;

import cn.gistack.sm.sjztods.entity.SkxsQkTj;
import cn.gistack.sm.sjztods.entity.WaterDataTermites;
import cn.gistack.sm.sjztods.service.IWaterDataTermitesService;
import cn.gistack.sm.sjztods.vo.WaterDataTermitesVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@Slf4j
@Api(tags = "白蚁监测数据表")
@RestController
@RequestMapping("/sjztods/waterDataTermites")
@AllArgsConstructor
public class WaterDataTermitesController {

    private final IWaterDataTermitesService waterDataTermitesService;

    /**
     * 修改状态
     * @param waterDataTermites
     * @return
     */
    @ApiOperation(value = "修改状态", notes = "修改状态")
    @PostMapping(value = "/updateStatus")
    public R updateStatus(@RequestBody WaterDataTermitesVO waterDataTermites) {
        if (StringUtil.isAllBlank(waterDataTermites.getStartTime(),
            waterDataTermites.getEndTime()) ||
            null == waterDataTermites.getStatus() ||
        null == waterDataTermites.getDeviceId()) {
            return R.fail("非法参数");
        }
        return R.status(waterDataTermitesService.updateWaterDataTermites(waterDataTermites.getStartTime(),
            waterDataTermites.getEndTime(),
            waterDataTermites.getStatus().toString(),
            waterDataTermites.getDeviceId().toString()));
    }

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/mapper/WaterDataTermitesMapper.java

New file
@@ -0,0 +1,14 @@
package cn.gistack.sm.sjztods.mapper;

import cn.gistack.sm.sjztods.entity.WaterDataTermites;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

public interface WaterDataTermitesMapper extends BaseMapper<WaterDataTermites> {

    int updateWaterDataTermites(@Param("startTime") String startTime,
                                 @Param("endTime") String endTime,
                                 @Param("status") String status,
                                 @Param("deviceId") String deviceId);

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/mapper/WaterDataTermitesMapper.xml

New file
@@ -0,0 +1,10 @@
<?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="cn.gistack.sm.sjztods.mapper.WaterDataTermitesMapper">

    <update id="updateWaterDataTermites">
        update SJZT_ODS."water_data_termites" set "status" = #{status}
        WHERE "device_id" = #{deviceId} and "ob_date" &gt;= #{startTime} and "ob_date" &lt;= #{endTime}
    </update>

</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/IWaterDataTermitesService.java

New file
@@ -0,0 +1,16 @@
package cn.gistack.sm.sjztods.service;

import cn.gistack.sm.sjztods.entity.WaterDataTermites;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * 白蚁监测数据
 */
public interface IWaterDataTermitesService extends IService<WaterDataTermites> {

    boolean updateWaterDataTermites(String startTime,
                                 String endTime,
                                 String status,
                                 String deviceId);

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/impl/WaterDataTermitesServiceImpl.java

New file
@@ -0,0 +1,19 @@
package cn.gistack.sm.sjztods.service.impl;

import cn.gistack.sm.sjztods.entity.WaterDataTermites;
import cn.gistack.sm.sjztods.mapper.WaterDataTermitesMapper;
import cn.gistack.sm.sjztods.service.IWaterDataTermitesService;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

@Service
@DS("ztznwh")
public class WaterDataTermitesServiceImpl extends ServiceImpl<WaterDataTermitesMapper, WaterDataTermites> implements IWaterDataTermitesService {


    @Override
    public boolean updateWaterDataTermites(String startTime, String endTime, String status, String deviceId) {
        return baseMapper.updateWaterDataTermites(startTime, endTime, status, deviceId) > 0;
    }
}