From edade5a0933d5abf784e8a86785bb5d0b9c5a8ac Mon Sep 17 00:00:00 2001 From: mg <maokecheng@163.com> Date: 星期一, 17 十月 2022 21:33:17 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server --- ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java | 50 ++--------- ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java | 3 ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java | 10 ++ ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml | 63 +++++++++++---- ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java | 2 ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java | 17 ++- ycl-common/src/main/java/com/ycl/dto/log/LogQueryParams.java | 7 - ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 18 ++- ycl-common/src/main/java/com/ycl/mapper/depart/UmsDepartMapper.java | 3 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 3 ycl-common/src/main/java/com/ycl/vo/depart/UmsDepartVO.java | 28 ------ ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java | 8 +- ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java | 8 +- ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java | 2 14 files changed, 108 insertions(+), 114 deletions(-) diff --git a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java index 893f3b4..e3d63c6 100644 --- a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java +++ b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ycl.annotation.LogSave; import com.ycl.api.BasePageDTO; import com.ycl.api.BasePageVO; @@ -45,7 +46,7 @@ @ApiOperation("娣诲姞閮ㄩ棬") @PostMapping(value = "/create") - @LogSave(operationType = "閮ㄩ棬绠$悊",contain = "娣诲姞閮ㄩ棬") + @LogSave(operationType = "閮ㄩ棬绠$悊", contain = "娣诲姞閮ㄩ棬") public CommonResult<Void> create(@Validated @RequestBody DepartVO.AddDepartVO addDepartVO) { departService.create(addDepartVO); return CommonResult.success(null); @@ -53,7 +54,7 @@ @ApiOperation("缂栬緫閮ㄩ棬") @PostMapping(value = "/update") - @LogSave(operationType = "閮ㄩ棬绠$悊",contain = "缂栬緫閮ㄩ棬") + @LogSave(operationType = "閮ㄩ棬绠$悊", contain = "缂栬緫閮ㄩ棬") public CommonResult<Void> create(@Validated @RequestBody DepartVO.UpdateDepartVO params) { departService.update(params); return CommonResult.success(null); @@ -61,7 +62,7 @@ @ApiOperation("鍒犻櫎") @PostMapping(value = "/delete") - @LogSave(operationType = "閮ㄩ棬绠$悊",contain = "鍒犻櫎閮ㄩ棬") + @LogSave(operationType = "閮ㄩ棬绠$悊", contain = "鍒犻櫎閮ㄩ棬") public CommonResult<Void> delete(@Validated @RequestBody DepartVO.IdDepartVO params) { departService.delete(params.getId()); return CommonResult.success(null); @@ -74,7 +75,7 @@ **/ @ApiOperation("鎵瑰鐞�-鍒犻櫎") @PostMapping(value = "/batch_deletion") - @LogSave(operationType = "閮ㄩ棬绠$悊",contain = "鎵归噺鍒犻櫎閮ㄩ棬") + @LogSave(operationType = "閮ㄩ棬绠$悊", contain = "鎵归噺鍒犻櫎閮ㄩ棬") public CommonResult delete(@RequestParam List<Long> ids) { if (ids.isEmpty()) { return CommonResult.failed("bad request parameter"); @@ -84,7 +85,7 @@ @ApiOperation("璇︽儏") @PostMapping(value = "/detail") - @LogSave(operationType = "閮ㄩ棬绠$悊",contain = "鏌ョ湅閮ㄩ棬") + @LogSave(operationType = "閮ㄩ棬绠$悊", contain = "鏌ョ湅閮ㄩ棬") public CommonResult<UmsDepart> detail(@Validated @RequestBody DepartVO.IdDepartVO params) { UmsDepart sccgDepart = departService.loadDepartById(params.getId()); return CommonResult.success(sccgDepart); @@ -106,8 +107,10 @@ @ApiOperation("鏌ヨ鍏ㄩ儴閮ㄩ棬") @GetMapping(value = "/page") - public CommonResult<IPage<UmsDepartVO>> page(DepartVO.PageDepartVO params) { - IPage<UmsDepartVO> page = departService.pageDepart(params); + public CommonResult<IPage<UmsDepartVO>> page(@RequestParam("currentPage") Integer currentPage, @RequestParam("pageSize") Integer pageSize, + @RequestParam(value = "departName", required = false) String departName) { + IPage<UmsDepartVO> page = new Page<>(currentPage, pageSize); + departService.pageDepart(departName, page); return CommonResult.success(page); } diff --git a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java index 40502f4..2527140 100644 --- a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java +++ b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java @@ -49,8 +49,8 @@ .eq(StringUtils.isNotBlank(logQueryParams.getPortEquipment()), UmsAdminLoginLog::getUserAgent, logQueryParams.getPortEquipment()) .eq(logQueryParams.getId() != null, UmsAdminLoginLog::getAdminId, logQueryParams.getId()) .between(logQueryParams.getStartTime() != null && logQueryParams.getEndTime() != null, UmsAdminLoginLog::getCreateTime, logQueryParams.getStartTime(), logQueryParams.getEndTime()) - .orderBy(logQueryParams.getSort()!=null&&logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime) - .orderBy(logQueryParams.getSort()!=null&&logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime)); + .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime) + .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime)); List<UmsAdminLogVO> umsAdminLogVOList = page.getRecords().stream() .map(item -> { UmsAdminLogVO umsAdminlogVO = new UmsAdminLogVO(); @@ -114,8 +114,8 @@ .like(StringUtils.isNotBlank(logQueryParams.getContent()), UmsAdminLoginLog::getContain, logQueryParams.getContent()) .eq(StringUtils.isNotBlank(logQueryParams.getOperationType()), UmsAdminLoginLog::getOperationType, logQueryParams.getOperationType()) .between(logQueryParams.getStartTime() != null && logQueryParams.getEndTime() != null, UmsAdminLoginLog::getCreateTime, logQueryParams.getStartTime(), logQueryParams.getEndTime()) - .orderBy(logQueryParams.getSort()!=null&&logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime) - .orderBy(logQueryParams.getSort()!=null&&logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime)) + .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime) + .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime)) .getRecords() .stream() .map(item -> { diff --git a/ycl-common/src/main/java/com/ycl/dto/log/LogQueryParams.java b/ycl-common/src/main/java/com/ycl/dto/log/LogQueryParams.java index 773df2a..4000980 100644 --- a/ycl-common/src/main/java/com/ycl/dto/log/LogQueryParams.java +++ b/ycl-common/src/main/java/com/ycl/dto/log/LogQueryParams.java @@ -2,10 +2,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import io.swagger.models.auth.In; import lombok.Data; - -import java.time.LocalDateTime; @Data @ApiModel(value = "鏃ュ織鏌ヨ") @@ -27,10 +24,10 @@ Long id; @ApiModelProperty(value = "寮�濮嬫椂闂�") - LocalDateTime startTime; + String startTime; @ApiModelProperty(value = "缁撴潫鏃堕棿") - LocalDateTime endTime; + String endTime; @ApiModelProperty(value = "缁堢璁惧") String portEquipment; diff --git a/ycl-common/src/main/java/com/ycl/mapper/depart/UmsDepartMapper.java b/ycl-common/src/main/java/com/ycl/mapper/depart/UmsDepartMapper.java index 79d5849..a89249a 100644 --- a/ycl-common/src/main/java/com/ycl/mapper/depart/UmsDepartMapper.java +++ b/ycl-common/src/main/java/com/ycl/mapper/depart/UmsDepartMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.entity.depart.UmsDepart; +import com.ycl.vo.depart.UmsDepartVO; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -17,4 +19,5 @@ List<UmsDepart> selectDepartList(); + List<UmsDepartVO> selectPageByName(@Param("departName") String departName, @Param("offset") Long offset, @Param("size") Long size); } diff --git a/ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java b/ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java index 50f9d50..550c14d 100644 --- a/ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java +++ b/ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java @@ -1,10 +1,12 @@ package com.ycl.service.depart; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.entity.depart.UmsDepart; import com.ycl.vo.depart.DepartVO; import com.ycl.vo.depart.UmsDepartVO; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -41,25 +43,29 @@ /** * 鍒犻櫎 + * * @param id */ void delete(long id); /** * 鏍戝舰 + * * @return */ List<UmsDepart> tree(); /** * 鍒嗛〉 - * @param params + * + * @param page * @return */ - IPage<UmsDepartVO> pageDepart(DepartVO.PageDepartVO params); + IPage<UmsDepartVO> pageDepart(String departName, IPage<UmsDepartVO> page); /** * 淇敼鐘舵�� + * * @param params */ void updateStatus(DepartVO.StatusDepartVO params); diff --git a/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java index 801bdf2..5979651 100644 --- a/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java +++ b/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java @@ -63,7 +63,7 @@ } UmsDepart depart = new UmsDepart(); BeanUtils.copyProperties(addDepartVO, depart); - depart.setStatus(Short.valueOf("1")); + depart.setStatus(Short.valueOf("1")); umsDepartService.save(depart); addDepartVO.getDepartManagerList() .forEach(item -> { @@ -139,44 +139,16 @@ } @Override - public IPage<UmsDepartVO> pageDepart(DepartVO.PageDepartVO params) { - Page<UmsDepart> page = new Page<>(params.getCurrent(), params.getPageSize()); - LambdaQueryWrapper<UmsDepart> query = new LambdaQueryWrapper<>(); - if (StringUtils.isNotBlank(params.getDepartName())) { - query.like(UmsDepart::getDepartName, params.getDepartName()); - } - if (PojoUtils.Vo.isUsefulSearchParam(params.getDepartType())) { - query.like(UmsDepart::getDepartType, params.getDepartType()); - } - query.orderByDesc(UmsDepart::getCreateTime); - Page<UmsDepart> departPage = sccgDepartMapper.selectPage(page, query); - Page<UmsDepartVO> umsDepartVOPage = new Page<>(); - BeanUtils.copyProperties(departPage, umsDepartVOPage); - List<UmsDepartVO> umsDepartVOList = new ArrayList<>(); - //璐熻矗浜� - if (CollUtil.isNotEmpty(departPage.getRecords())) { - for (UmsDepart record : departPage.getRecords()) { - UmsDepartVO umsDepartVO = new UmsDepartVO(); - BeanUtils.copyProperties(record, umsDepartVO); - umsDepartVO.setDepartType(dataDictionaryMapper - .selectOne(new LambdaQueryWrapper<DataDictionary>() - .eq(DataDictionary::getId, record.getDepartType())) - .getName()); - umsDepartVOList.add(umsDepartVO); - List<UmsDepartManage> umsAdminDeparts = umsAdminDepartService.queryByDepartId(record.getId()); - if (CollUtil.isNotEmpty(umsAdminDeparts)) { - List<AdminDepartDTO.UserInfoDTO> userInfoDTOS = umsAdminDeparts.stream().map(a -> { - AdminDepartDTO.UserInfoDTO userInfoDTO = new AdminDepartDTO.UserInfoDTO(); - userInfoDTO.setUserId(a.getUserId()); -// userInfoDTO.setUsername(umsAdminService.getById(a.getUserId()).getUsername()); - return userInfoDTO; - }).collect(Collectors.toList()); - record.setUserInfoDTOS(userInfoDTOS); - } - } - } - umsDepartVOPage.setRecords(umsDepartVOList); - return umsDepartVOPage; + public IPage<UmsDepartVO> pageDepart(String departName, IPage<UmsDepartVO> page) { + + List<UmsDepartVO> ls = sccgDepartMapper.selectPageByName(departName, page.offset(), page.getSize()); + LambdaQueryWrapper<UmsDepart> queryWrapper = new LambdaQueryWrapper<UmsDepart>() + .like(StringUtils.isNotEmpty(departName), UmsDepart::getDepartName, departName); + long total = this.count(queryWrapper); + + page.setRecords(ls); + page.setTotal(total); + return page; } @Override diff --git a/ycl-common/src/main/java/com/ycl/vo/depart/UmsDepartVO.java b/ycl-common/src/main/java/com/ycl/vo/depart/UmsDepartVO.java index 9abc73e..5bdc4be 100644 --- a/ycl-common/src/main/java/com/ycl/vo/depart/UmsDepartVO.java +++ b/ycl-common/src/main/java/com/ycl/vo/depart/UmsDepartVO.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.*; import com.ycl.api.BaseEntity; import com.ycl.dto.user.AdminDepartDTO; +import com.ycl.entity.depart.UmsDepart; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; @@ -22,32 +23,9 @@ @Getter @Setter @ApiModel(value = "umsDepartVO", description = "閮ㄩ棬琛�") -public class UmsDepartVO { - - @ApiModelProperty("涓婚敭") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - @ApiModelProperty("閮ㄩ棬鍚嶇О") - private String departName; - - @ApiModelProperty("閮ㄩ棬鎻忚堪") - private String departDes; +public class UmsDepartVO extends UmsDepart { @ApiModelProperty("閮ㄩ棬绫诲瀷") - private String departType; + private String departTypeName; - @ApiModelProperty("鐖剁骇id,榛樿0") - private Long parentId; - - @ApiModelProperty("鍋滅敤鐘舵�侊紝0->false,1->true,榛樿鍋滅敤") - private Short status; - - /** - * 閫昏緫鍒犻櫎 0:false 1:true 榛樿0 - */ - @ApiModelProperty(value = "鏄惁鍒犻櫎", hidden = true) - @TableField(select = false) - @TableLogic() - private byte isDeleted; } diff --git a/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml b/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml index b8ec297..a477ce2 100644 --- a/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml +++ b/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml @@ -4,30 +4,57 @@ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> <resultMap id="BaseResultMap" type="com.ycl.entity.depart.UmsDepart"> - <id column="id" property="id" /> - <result column="depart_name" property="departName" /> - <result column="depart_des" property="departDes" /> - <result column="depart_type" property="departType" /> - <result column="parent_id" property="parentId" /> - <result column="status" property="status" /> - <result column="create_time" property="createTime" /> - <result column="update_time" property="updateTime" /> - <result column="is_deleted" property="isDeleted" /> + <id column="id" property="id"/> + <result column="depart_name" property="departName"/> + <result column="depart_des" property="departDes"/> + <result column="depart_type" property="departType"/> + <result column="parent_id" property="parentId"/> + <result column="status" property="status"/> + <result column="create_time" property="createTime"/> + <result column="update_time" property="updateTime"/> + <result column="is_deleted" property="isDeleted"/> </resultMap> <resultMap type="com.ycl.entity.depart.UmsDepart" id="UserDepartResultMap" extends="BaseResultMap"> <collection property="userInfoDTOS" javaType="ArrayList" ofType="com.ycl.dto.user.DepartUserDTO"> - <id column="user_id" property="userId" /> - <result column="username" property="username" /> + <id column="user_id" property="userId"/> + <result column="username" property="username"/> </collection> </resultMap> - <select id="selectDepartList" resultMap="UserDepartResultMap"> - SELECT - ud.*,ua.id user_id,ua.username - FROM - ums_depart ud - LEFT JOIN ums_depart_manager udm ON ud.id = udm.depart_id - LEFT JOIN ums_admin ua ON udm.user_id = ua.id + <resultMap id="DepartVOMap" type="com.ycl.vo.depart.UmsDepartVO" extends="BaseResultMap"> + <result column="depart_type_name" property="departTypeName" jdbcType="VARCHAR"></result> + <collection property="userInfoDTOS" javaType="ArrayList" ofType="com.ycl.dto.user.DepartUserDTO"> + <id column="user_id" property="userId"/> + <result column="username" property="username"/> + </collection> + </resultMap> + + <select id="selectDepartList" resultMap="UserDepartResultMap"> + SELECT ud.*, + ua.id user_id, + ua.username + FROM ums_depart ud + LEFT JOIN ums_depart_manager udm ON ud.id = udm.depart_id + LEFT JOIN ums_admin ua ON udm.user_id = ua.id + </select> + <select id="selectPageByName" resultMap="DepartVOMap"> + SELECT t_0.*, + ua.id user_id, + ua.username, + dd.`name` as depart_type_name + FROM ( + SELECT ud.* + FROM ums_depart ud + WHERE is_deleted = 0 + <if test="departName!=null and departName!=''"> + and ud.name like CONCAT('%',#{departName},'%') + </if> + ORDER BY create_time desc + LIMIT #{offset}, #{size} + ) t_0 + LEFT JOIN ums_depart_manager udm ON t_0.id = udm.depart_id + LEFT JOIN ums_admin ua ON udm.user_id = ua.id + left join ums_data_dictionary as dd on t_0.depart_type = dd.id </select> diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java index d6e7b01..5ee1b2c 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java @@ -28,6 +28,8 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.List; @@ -121,7 +123,7 @@ @ApiImplicitParams({ @ApiImplicitParam(name = "type", value = "1 杩濊,2 杩濆缓", dataType = "Integer") }) - @LogSave(operationType = "浜嬮」澶勭疆绠$悊",contain = "鍒犻櫎妗堜欢") + @LogSave(operationType = "浜嬮」澶勭疆绠$悊", contain = "鍒犻櫎妗堜欢") public CommonResult removeCase(@RequestParam Integer id, @RequestParam Integer type) { Integer violationType = 1; Integer illegalBuildingType = 2; @@ -146,7 +148,7 @@ @ApiImplicitParams({ @ApiImplicitParam(name = "type", value = "1 杩濊,2 杩濆缓", dataType = "Integer") }) - @LogSave(operationType = "浜嬮」澶勭疆绠$悊",contain = "鎵归噺鍒犻櫎妗堜欢") + @LogSave(operationType = "浜嬮」澶勭疆绠$悊", contain = "鎵归噺鍒犻櫎妗堜欢") public CommonResult removeCases(@RequestParam List<Long> ids, @RequestParam Integer type) { Integer violationType = 1; Integer illegalBuildingType = 2; @@ -168,7 +170,7 @@ **/ @ApiOperation(value = "娣诲姞杩濊妗堜欢") @PostMapping("/addition_violation") - @LogSave(operationType = "浜嬮」澶勭疆绠$悊",contain = "鏂板杩濆缓妗堜欢") + @LogSave(operationType = "浜嬮」澶勭疆绠$悊", contain = "鏂板杩濆缓妗堜欢") public CommonResult addViolationCase(@RequestBody @Validated ViolationParam violationParam) { Integer violation = 1; Integer resource = 2; @@ -178,6 +180,7 @@ baseCase.setCategory(violation); baseCase.setCode(utilNumber.createCaseCode()); baseCase.setState(BaseCaseStatus.PENDING); + baseCase.setAlarmTime(LocalDateTime.parse(violationParam.getAlarmTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); baseCaseService.save(baseCase); return CommonResult.success(baseCaseService.saveViolationCase(violationParam, baseCase.getId())); } @@ -189,7 +192,7 @@ **/ @ApiOperation(value = "娣诲姞杩濆缓妗堜欢") @PostMapping("/addition_illegal_building") - @LogSave(operationType = "浜嬮」澶勭疆绠$悊",contain = "鏂板杩濊妗堜欢") + @LogSave(operationType = "浜嬮」澶勭疆绠$悊", contain = "鏂板杩濊妗堜欢") public CommonResult addIllegalBuildingCase(@RequestBody @Validated IllegalBuildingParam illegalBuildingParam) { Integer illegalBuilding = 2; Integer resource = 2; @@ -199,6 +202,7 @@ baseCase.setEventSource(resource); baseCase.setCode(utilNumber.createCaseCode()); baseCase.setState(BaseCaseStatus.PENDING); + baseCase.setAlarmTime(LocalDateTime.parse(illegalBuildingParam.getAlarmTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); baseCaseService.save(baseCase); return CommonResult.success(baseCaseService.saveIllegalBuildingCase(illegalBuildingParam, baseCase.getId())); } @@ -259,9 +263,9 @@ @ApiOperation(value = "缁撴") @PutMapping("/end_case") - @LogSave(operationType = "浜嬮」澶勭疆绠$悊",contain = "妗堜欢缁撴") - public CommonResult endCase(@RequestParam Long caseId, @RequestParam String result,@RequestParam String opinion) { - baseCaseService.endCase(caseId, result,opinion); + @LogSave(operationType = "浜嬮」澶勭疆绠$悊", contain = "妗堜欢缁撴") + public CommonResult endCase(@RequestParam Long caseId, @RequestParam String result, @RequestParam String opinion) { + baseCaseService.endCase(caseId, result, opinion); return CommonResult.success("end case success~!"); } diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java index 3c06d2a..a19f04b 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java @@ -78,7 +78,7 @@ BeanUtils.copyProperties(uploadDisposingResultParam, investigation); investigation.setBaseCaseId(caseId); investigation.setCreateTime(LocalDateTime.now()); - investigation.setCreateUser(user.getUserId().longValue()); + investigation.setCreateUser(user.getUserId()); investigation.setPartyId(partyInfo.getId()); iInvestigationService.save(investigation); //鍒拌揪 @@ -86,7 +86,7 @@ BeanUtils.copyProperties(uploadDisposingResultParam, arrivalSituation); arrivalSituation.setBaseCaseId(caseId); arrivalSituation.setCreateTime(LocalDateTime.now()); - arrivalSituation.setCreateUser(user.getUserId().longValue()); + arrivalSituation.setCreateUser(user.getUserId()); iArrivalSituationService.save(arrivalSituation); //鏂囦功 Integer illegalBuildingType = 2; @@ -96,7 +96,7 @@ writ.setBaseCaseId(caseId); writ.setIllegalBuildingId(caseId); writ.setCreateTime(LocalDateTime.now()); - writ.setCreateUser(user.getUserId().longValue()); + writ.setCreateUser(user.getUserId()); iWritService.save(writ); } baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, caseId).set(BaseCase::getState, BaseCaseStatus.DISPOSE)); @@ -105,7 +105,7 @@ disposeRecord.setBaseCaseId(caseId); disposeRecord.setState(0); disposeRecord.setCreateTime(LocalDateTime.now()); - disposeRecord.setCreateUser(user.getUserId().longValue()); + disposeRecord.setCreateUser(user.getUserId()); disposeRecord.setStepName(stepName); disposeRecord.setStartTime(LocalDateTime.now()); iDisposeRecordService.addRecord(disposeRecord); diff --git a/ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java b/ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java index cd8091e..779be4c 100644 --- a/ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java +++ b/ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java @@ -25,7 +25,7 @@ * 鎶ヨ鏃堕棿 */ @TableField("alarm_time") - private LocalDateTime alarmTime; + private String alarmTime; /** * 鎵�灞炵ぞ鍖� diff --git a/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java b/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java index fc67d3e..89d529c 100644 --- a/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java +++ b/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java @@ -24,7 +24,7 @@ * 鎶ヨ鏃堕棿 */ @TableField("alarm_time") - private LocalDateTime alarmTime; + private String alarmTime; /** * 灏忕被 diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java index eb69ffa..2a03614 100644 --- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java +++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java @@ -1,12 +1,15 @@ package com.ycl.entity.caseHandler; +import cn.hutool.core.date.LocalDateTimeUtil; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java index ace3776..8510dd5 100644 --- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java @@ -388,10 +388,11 @@ //淇敼缁撴璁板綍 DisposeRecord disposeRecord = new DisposeRecord(); - disposeRecord.setHandlerId(user.getUserId().longValue()); + disposeRecord.setHandlerId(user.getUserId()); //缁撴宸茬粨鏉� disposeRecord.setState(1); disposeRecord.setEndTime(LocalDateTime.now()); + disposeRecord.setHandlerId(user.getUserId()); disposeRecordMapper.update(disposeRecord, updateWrapper); } } \ No newline at end of file -- Gitblit v1.8.0