Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2022-11-29 c441ee63996286f6e6bd92ecd51dbf2239d2d8ef

Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

# Conflicts:
#	ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
#	ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java

 ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminLoginLogMapper.java

@@ -6,6 +6,8 @@
import com.ycl.entity.user.UmsAdminLoginLog;
import com.ycl.entity.user.vo.UmsAdminLogVO;

import java.util.List;

/**
 * <p>
 * 后台用户登录日志表 Mapper 接口
@@ -13,4 +15,6 @@
 */
public interface UmsAdminLoginLogMapper extends BaseMapper<UmsAdminLoginLog> {
    Page<UmsAdminLogVO> selectByCondition(Page<UmsAdminLogVO> umsAdminLogVOPage, LogQueryParams logQueryParams);

    List<UmsAdminLogVO> selectByCondition(LogQueryParams logQueryParams);
}

 ycl-common/src/main/java/com/ycl/service/user/IAdminLoginLogService.java

@@ -6,6 +6,8 @@
import com.ycl.entity.user.UmsAdminLoginLog;
import com.ycl.entity.user.vo.UmsAdminLogVO;

import java.util.List;

/**
 * <p>
 * 后台用户登录日志表 服务类
@@ -17,4 +19,6 @@
public interface IAdminLoginLogService extends IService<UmsAdminLoginLog> {

    Page<UmsAdminLogVO> pageList(LogQueryParams logQueryParams);

    List<UmsAdminLogVO> List(LogQueryParams logQueryParams);
}

 ycl-common/src/main/java/com/ycl/service/user/impl/AdminLoginLogServiceImpl.java

@@ -31,4 +31,9 @@
        Page<UmsAdminLogVO> umsAdminLogVOPage = new Page<UmsAdminLogVO>().setCurrent(logQueryParams.getCurrent()).setSize(logQueryParams.getSize());
        return umsAdminLoginLogMapper.selectByCondition(umsAdminLogVOPage,logQueryParams);
    }

    @Override
    public List<UmsAdminLogVO> List(LogQueryParams logQueryParams) {
        return umsAdminLoginLogMapper.selectByCondition(logQueryParams);
    }
}

 ycl-platform/src/main/java/com/ycl/controller/cockpit/teamConstruction/TeamConstructionController.java

@@ -92,25 +92,21 @@
    @LogSave(operationType = "队伍建设管理", contain = "导出")
    @ApiImplicitParams(
            {
                    @ApiImplicitParam(name = "size", required = true, value = "页面数量"),
                    @ApiImplicitParam(name = "current", required = true, value = "页码"),
                    @ApiImplicitParam(name = "departName", value = "部门名称"),
                    @ApiImplicitParam(name = "status", value = "状态")}
    )
    @SneakyThrows
    public void export(@RequestParam() Integer size,
                       @RequestParam() Integer current,
                       @RequestParam(name = "departName", required = false) String departName,
                       @RequestParam(name = "status", required = false) Integer status,
                       HttpServletResponse response) {
    public void export(
            @RequestParam(name = "departName", required = false) String departName,
            @RequestParam(name = "status", required = false) Integer status,
            HttpServletResponse response) {
        Integer isDelete = 0;
        String sheetName = "数据";
        EasyExcelUtils.export(response, sheetName, TeamConstruction.class, iTeamConstructionService
                .page(new Page<TeamConstruction>().setSize(size).setCurrent(current), new LambdaQueryWrapper<TeamConstruction>()
                .list(new LambdaQueryWrapper<TeamConstruction>()
                        .like(StringUtils.isNotBlank(departName), TeamConstruction::getName, departName)
                        .eq(status != null, TeamConstruction::getStatus, status)
                        .eq(TeamConstruction::getIsDelete, isDelete))
                .getRecords());
                        .eq(TeamConstruction::getIsDelete, isDelete)));
    }



 ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java

@@ -78,12 +78,7 @@
    @SneakyThrows
    @LogSave(operationType = "卡口管理", contain = "导出卡口")
    public void export(HttpServletResponse response,
                       @RequestParam(required = false) Integer size,
                       @RequestParam(required = false) Integer current,
                       @RequestParam(required = false) String bayonetName) {
        Page<EquipmentBayonet> equipmentBayonetPage = new Page<>();
        equipmentBayonetPage.setCurrent(current);
        equipmentBayonetPage.setSize(size);
        EasyExcelUtils.export(response, "数据", EquipmentBayonetVO.class, iEquipmentBayonetService.selectEquipmentPage(equipmentBayonetPage, bayonetName).getRecords());
        EasyExcelUtils.export(response, "数据", EquipmentBayonetVO.class, iEquipmentBayonetService.selectEquipmentList(bayonetName));
    }
}

 ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java

@@ -34,5 +34,7 @@

    Page<QueryForViolationVO> selectViolationPage(Page<QueryForViolationVO> setCurrent, QueryForViolationParam queryForViolationParam);

    List<QueryForViolationVO> selectViolationPage(QueryForViolationParam queryForViolationParam);

    Page<BaseCaseVO> selectVideoInspection(Page<Object> objectPage);
}

 ycl-platform/src/main/java/com/ycl/mapper/equipment/EquipmentBayonetMapper.java

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.vo.equipment.EquipmentBayonetVO;

import java.util.List;

/**
 * <p>
 * 卡口管理 Mapper 接口
@@ -16,4 +18,6 @@
public interface EquipmentBayonetMapper extends BaseMapper<EquipmentBayonet> {

    Page<EquipmentBayonetVO> selectEquipmentPage(Page<EquipmentBayonet> equipmentBayonetPage, String bayonetName);

    List<EquipmentBayonetVO> selectEquipmentPage(String bayonetName);
}

 ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java

@@ -60,6 +60,8 @@

    Page<QueryForViolationVO> selectViolation(QueryForViolationParam queryForViolationParam);

    List<QueryForViolationVO> selectViolationList(QueryForViolationParam queryForViolationParam);

    Page<BaseCaseVO> selectVideoInspection(Integer current);

    Map<String,Object> selectCount();

 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java

@@ -389,6 +389,11 @@
    }

    @Override
    public List<QueryForViolationVO> selectViolationList(QueryForViolationParam queryForViolationParam) {
        return  baseCaseMapper.selectViolationPage(queryForViolationParam);
    }

    @Override
    public Page<BaseCaseVO> selectVideoInspection(Integer current) {
        return baseCaseMapper.selectVideoInspection(new Page<>(current, 1));
    }

 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java

@@ -73,15 +73,13 @@
    @Transactional(rollbackFor = Exception.class)
    public Boolean saveOrUpdateUpload(UploadDisposingResultParam uploadDisposingResultParam) {
        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        ArrivalSituation arrivalSituationed = iArrivalSituationService.getOne(new LambdaQueryWrapper<ArrivalSituation>().eq(ArrivalSituation::getBaseCaseId, uploadDisposingResultParam.getCaseId()));
        if (arrivalSituationed != null) {
        List<ArrivalSituation> list = iArrivalSituationService.list(new LambdaQueryWrapper<ArrivalSituation>().eq(ArrivalSituation::getBaseCaseId, uploadDisposingResultParam.getCaseId()));
        if (!list.isEmpty()) {
            //当事人
            PartyInfo partyInfo = new PartyInfo();
            if (StringUtils.isNotEmpty(uploadDisposingResultParam.getName())) {
                BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
                partyInfo.setId(uploadDisposingResultParam.getPartyInfoId());
                iPartyInfoService.updateById(partyInfo);
            }
            BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
            partyInfo.setId(uploadDisposingResultParam.getPartyInfoId());
            iPartyInfoService.updateById(partyInfo);
            //调查取证
            Investigation investigation = new Investigation();
            BeanUtils.copyProperties(uploadDisposingResultParam, investigation);
@@ -127,12 +125,10 @@
        } else {
            //当事人
            PartyInfo partyInfo = new PartyInfo();
            if (StringUtils.isNotEmpty(uploadDisposingResultParam.getName())) {
                BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
                partyInfo.setCreateUser(user.getUserId().intValue());
                partyInfo.setCreateTime(LocalDateTime.now());
                iPartyInfoService.save(partyInfo);
            }
            BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
            partyInfo.setCreateUser(user.getUserId().intValue());
            partyInfo.setCreateTime(LocalDateTime.now());
            iPartyInfoService.save(partyInfo);
            //调查取证
            Investigation investigation = new Investigation();
            BeanUtils.copyProperties(uploadDisposingResultParam, investigation);
@@ -166,10 +162,9 @@
                writ.setIllegalBuildingId(uploadDisposingResultParam.getCaseId());
                writ.setCreateTime(LocalDateTime.now());
                writ.setCreateUser(user.getUserId());
                DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                writ.setLimitTime(LocalDateTime.parse(uploadDisposingResultParam.getLimitTime(), dtf));
                writ.setRectifyTime(LocalDateTime.parse(uploadDisposingResultParam.getRectifyTime(), dtf));
                writ.setSendTime(LocalDateTime.parse(uploadDisposingResultParam.getSendTime(), dtf));
                writ.setLimitTime(LocalDateTime.parse(uploadDisposingResultParam.getLimitTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss")));
                writ.setRectifyTime(LocalDateTime.parse(uploadDisposingResultParam.getRectifyTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss")));
                writ.setSendTime(LocalDateTime.parse(uploadDisposingResultParam.getSendTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss")));
                iWritService.save(writ);
                imageResources.setUrl(StringUtils
                        .joinWith(",", uploadDisposingResultParam.getPic()

 ycl-platform/src/main/java/com/ycl/service/equipment/IEquipmentBayonetService.java

@@ -17,4 +17,6 @@
 */
public interface IEquipmentBayonetService extends IService<EquipmentBayonet> {
    Page<EquipmentBayonetVO> selectEquipmentPage(Page<EquipmentBayonet> equipmentBayonetPage, String bayonetName);

    List<EquipmentBayonetVO> selectEquipmentList(String bayonetName);
}

 ycl-platform/src/main/java/com/ycl/service/equipment/impl/EquipmentBayonetServiceImpl.java

@@ -9,6 +9,7 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -28,4 +29,9 @@
    public Page<EquipmentBayonetVO> selectEquipmentPage(Page<EquipmentBayonet> equipmentBayonetPage, String bayonetName) {
       return equipmentBayonetMapper.selectEquipmentPage(equipmentBayonetPage, bayonetName);
    }

    @Override
    public List<EquipmentBayonetVO> selectEquipmentList(String bayonetName) {
        return equipmentBayonetMapper.selectEquipmentPage(bayonetName);
    }
}

 ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java

@@ -10,6 +10,7 @@
import com.ycl.entity.message.Message;
import com.ycl.entity.message.SendReq;
import com.ycl.entity.message.SendRes;
import com.ycl.entity.user.UmsAdmin;
import com.ycl.exception.ApiException;
import com.ycl.mapper.message.MessageMapper;
import com.ycl.mapper.user.UmsAdminMapper;
@@ -80,6 +81,7 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public String sendMessage(Message message) {

        Message savedMessage = messageMapper.selectOne(new LambdaQueryWrapper<Message>()
                .eq(Message::getTargetTo, message.getTargetTo())
                .eq(Message::getTargetFrom, message.getTargetFrom())
@@ -90,7 +92,7 @@
        }

        ArrayList<Long> ids = new ArrayList<>();

        message.setTargetFrom(umsAdminMapper.selectById(message.getCreateUser()).getUsername());
        for (String receive : message.getTargetTo().split(",")) {
            Message sendMessage = new Message();
            BeanUtils.copyProperties(message, sendMessage);

 ycl-platform/src/main/java/com/ycl/service/message/impl/SmsTemplateServiceImpl.java

@@ -24,11 +24,11 @@
    public IPage<SmsTemplate> list(SmsTemplate smsTemplate) {
        Page<SmsTemplate> page = new Page<>(smsTemplate.getCurrent(), smsTemplate.getPageSize());
        LambdaQueryWrapper<SmsTemplate> queryWrapper = new LambdaQueryWrapper<>();
        if (CommonUtils.isNotEmpty(smsTemplate.getType())) {
        if (CommonUtils.isNotEmpty(smsTemplate.getType()) && smsTemplate.getType()!=0) {
            queryWrapper.eq(SmsTemplate::getType, smsTemplate.getType());
        }
        if (CommonUtils.isNotEmpty(smsTemplate.getTitle())) {
            queryWrapper.eq(SmsTemplate::getTitle, smsTemplate.getTitle());
        if (!smsTemplate.getTitle().isEmpty()) {
            queryWrapper.like(SmsTemplate::getTitle, smsTemplate.getTitle());
        }
        Page<SmsTemplate> result = baseMapper.selectPage(page, queryWrapper);
        return result;

 ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolIllegalBuildingVO.java

@@ -1,11 +1,8 @@
package com.ycl.vo.casePool;

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

import java.time.LocalDateTime;

@Data
@ApiModel("案件池违建立案件")

 ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java

@@ -43,7 +43,11 @@
     * 报警时间
     */
    @ApiModelProperty(value = "报警时间")
<<<<<<< .mine
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
=======
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
>>>>>>> .theirs
    private LocalDateTime alarmTime;


@@ -76,5 +80,6 @@
     * 关闭时间
     */
    @ApiModelProperty(value = "关闭时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime closeTime;
}

 ycl-platform/src/main/resources/application-dev.yml

@@ -64,10 +64,3 @@
  apId: 1
  sign: sign
  url: http://localhost:8082/sccg/text/sms_res

point:
  severIpAddress: http://localhost:8082/sccg/text/point
  username: text
  password: 123456
  sendIp: 192.168.3.137
  os: WinPc