diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java index 825b936..6a8d590 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java @@ -50,6 +50,7 @@ public class RepairController extends BaseController { @PostMapping("flow/start") public R startFlow(@RequestBody RepairDTO repairDTO) { Long userId = getLoginStaffId(); + if (!repairService.submitCheck(userId.toString())) return R.error("报修过于频繁,请稍后再试."); String result = repairService.handleFlow(repairDTO.getRepair(), userId, repairDTO.getFiles(), null, null); return IRepairService.OK.equals(result) ? R.ok() : R.error(result); } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairAttachMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairAttachMapper.java index 0674388..bbe0e10 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairAttachMapper.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairAttachMapper.java @@ -1,7 +1,6 @@ package com.ics.admin.mapper; import com.ics.admin.domain.RepairAttach; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -14,7 +13,7 @@ import java.util.List; * @date 2024-07-31 */ @Mapper -public interface RepairAttachMapper extends BaseMapper { +public interface RepairAttachMapper { /** * 查询附件 * diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairMapper.java index c73140d..981e01b 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairMapper.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairMapper.java @@ -1,6 +1,5 @@ package com.ics.admin.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ics.admin.domain.Repair; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -9,12 +8,12 @@ import java.util.List; /** * 工单管理Mapper接口 - * + * * @author ics * @date 2021-03-25 */ @Mapper -public interface RepairMapper extends BaseMapper { +public interface RepairMapper { /** * 查询工单 * @@ -25,8 +24,11 @@ public interface RepairMapper extends BaseMapper { List normalRepairList(@Param("userId") String userId, @Param("type") String type); + List preRepairList(@Param("userId") String userId, @Param("type") String type); + List workRepairList(@Param("userId") String userId, @Param("type") String type); + List adminRepairList(@Param("userId") String userId, @Param("type") String type); @@ -62,4 +64,35 @@ public interface RepairMapper extends BaseMapper { */ int deleteRepairByIds(String[] ids); + /** + * 红色预警 + * + * @param day 小于day天红色预警 + */ + int repairTimeOutRed(Integer day); + + /** + * 橙色预警 + * + * @param day 小于day天橙色预警 + */ + int repairTimeOutOrange(Integer day); + + /** + * 工单结束后解除预警 + */ + int removeWarn(); + /** + * 工单结束后7天没有评价的自动好评 + * + * @return + */ + int repairGoodEval(); + + /** + * 检查3分钟内指定用户提交工单数量 + * @param userId + */ + int submitCheck(String userId); + } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairAttachService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairAttachService.java index fd1a4d0..79d4032 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairAttachService.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairAttachService.java @@ -1,6 +1,5 @@ package com.ics.admin.service; -import com.baomidou.mybatisplus.extension.service.IService; import com.ics.admin.domain.RepairAttach; import java.util.List; @@ -11,7 +10,7 @@ import java.util.List; * @author chen * @date 2024-07-31 */ -public interface IRepairAttachService extends IService { +public interface IRepairAttachService { String FILE_VOICE = "voice"; diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairService.java index 165ea19..9cd3a6b 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairService.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairService.java @@ -3,7 +3,6 @@ package com.ics.admin.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ics.admin.domain.Repair; import com.ics.admin.utils.FlowOperate; -import com.ics.common.core.domain.IcsCustomerStaff; import java.util.List; @@ -13,7 +12,7 @@ import java.util.List; * @author ics * @date 2021-03-25 */ -public interface IRepairService extends IService { +public interface IRepairService { String OK = "okay"; /** @@ -57,15 +56,6 @@ public interface IRepairService extends IService { * @return 结果 */ int updateRepair(Repair repair); - - /** - * 批量删除工单 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - int deleteRepairByIds(String ids); - /** * 删除工单信息 * @@ -74,4 +64,27 @@ public interface IRepairService extends IService { */ int deleteRepairById(Long id); + /** + * 工单超时预警 + */ + int repairTimeOutWarn(); + + /** + * 工单结束后解除预警 + */ + int removeWarn(); + + /** + * 工单自动好评 + */ + int repairGoodEval(); + + /** + * 3分钟内不允许提交多个订单 + * + * @param userId 用户id + * @return true 可以报修,false 不能报修 + */ + boolean submitCheck(String userId); + } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairAttachServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairAttachServiceImpl.java index d3793dc..ac8be1e 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairAttachServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairAttachServiceImpl.java @@ -1,6 +1,5 @@ package com.ics.admin.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ics.admin.domain.RepairAttach; import com.ics.admin.mapper.RepairAttachMapper; import com.ics.admin.service.IRepairAttachService; @@ -21,7 +20,7 @@ import java.util.List; */ @Slf4j @Service -public class RepairAttachServiceImpl extends ServiceImpl implements IRepairAttachService { +public class RepairAttachServiceImpl implements IRepairAttachService { @Autowired private RepairAttachMapper repairAttachMapper; diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java index 0e3b8ee..cc0c265 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java @@ -1,7 +1,5 @@ package com.ics.admin.service.impl; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ics.admin.domain.Repair; import com.ics.admin.domain.RepairLog; @@ -16,7 +14,9 @@ import com.ics.admin.service.IRepairService; import com.ics.admin.utils.FlowOperate; import com.ics.common.core.domain.IcsCustomerStaff; import com.ics.common.utils.StringUtils; +import com.ics.system.domain.DictData; import com.ics.system.domain.Sn; +import com.ics.system.service.IDictDataService; import com.ics.system.service.ISnService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -34,7 +34,8 @@ import java.util.List; */ @Slf4j @Service -public class RepairServiceImpl extends ServiceImpl implements IRepairService { +public class RepairServiceImpl implements IRepairService { + @Autowired private ISnService snService; @@ -57,6 +58,9 @@ public class RepairServiceImpl extends ServiceImpl impleme @Autowired private IRepairAttachService repairAttachService; + @Autowired + private IDictDataService dictDataService; + @Transactional(rollbackFor = Exception.class) @Override @@ -237,7 +241,7 @@ public class RepairServiceImpl extends ServiceImpl impleme */ @Override public int insertRepair(Repair repair) { - return repairMapper.insert(repair); + return repairMapper.insertRepair(repair); } /** @@ -248,19 +252,7 @@ public class RepairServiceImpl extends ServiceImpl impleme */ @Override public int updateRepair(Repair repair) { - return repairMapper.updateById(repair); - } - - /** - * 删除工单对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteRepairByIds(String ids) { - String[] idsArray = StrUtil.split(ids, ","); - return repairMapper.deleteBatchIds(CollUtil.toList(idsArray)); + return repairMapper.updateRepair(repair); } /** @@ -279,4 +271,32 @@ public class RepairServiceImpl extends ServiceImpl impleme return repairMapper.deleteRepairById(id); } + @Override + public int repairTimeOutWarn() { + List list = dictDataService.selectDictDataByType("repair_timeout"); + if (list.size() == 2) { + Integer orange = Integer.valueOf(list.get(0).getDictValue()); + Integer red = Integer.valueOf(list.get(1).getDictValue()); + int r = repairMapper.repairTimeOutRed(red); + int o = repairMapper.repairTimeOutOrange(orange); + return r + o; + } + return 0; + } + + @Override + public int removeWarn() { + return repairMapper.removeWarn(); + } + + @Override + public int repairGoodEval() { + return repairMapper.repairGoodEval(); + } + + @Override + public boolean submitCheck(String userId) { + int num = repairMapper.submitCheck(userId); + return num == 0; + } } diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAttachMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAttachMapper.xml index 8c6df1e..f5cb3b2 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAttachMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAttachMapper.xml @@ -50,12 +50,12 @@ WHERE id = #{id} and delete_flag = 0 - where repair_id= #{repairId} and delete_flag = 0 - + INSERT INTO ics_repair_attach repair_id, @@ -92,7 +92,7 @@ - + UPDATE ics_repair_attach set repair_id= #{repairId} where id in #{id} @@ -106,6 +106,8 @@ - DELETE FROM ics_repair_attach WHERE id = #{id} + DELETE + FROM ics_repair_attach + WHERE id = #{id} \ No newline at end of file diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml index cb1e0f9..d83712d 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml @@ -206,7 +206,7 @@ where delete_flag = 0 and create_by = #{userId} - and status < 9 + and status 9 and status = 9 and status = 13 order by create_time desc @@ -217,7 +217,7 @@ where delete_flag = 0 and per_userid = #{userId} and status = 3 and status = 1 - and status > 3 and status <> 11 + and status ]]> 3 and status ]]> 11 and status = 11 order by create_time desc @@ -250,4 +250,24 @@ + + update ics_repair set warn=5 where delete_flag=0 and status 9 and timeout is not null and warn ]]> 5 and TIMESTAMPDIFF(DAY,NOW(),timeout) #{day} + + + + update ics_repair set warn=3 where delete_flag=0 and status 9 and timeout is not null and warn 1 and TIMESTAMPDIFF(DAY,NOW(),timeout) #{day} + + + + update ics_repair set warn=0 where delete_flag=0 and status = ]]> 9 and warn ]]> 0 + + + + update ics_repair set eval_service=5,eval_time=NOW(),eval_user_id=-1,status=13 + where delete_flag=0 and status=9 and end_date is not null and TIMESTAMPDIFF(DAY,end_date,NOW()) = ]]> 7 + + + \ No newline at end of file diff --git a/shoot-hand/ics-quartz/src/main/java/com/ics/quartz/task/RepairTask.java b/shoot-hand/ics-quartz/src/main/java/com/ics/quartz/task/RepairTask.java index 4fc3ce0..7f15700 100644 --- a/shoot-hand/ics-quartz/src/main/java/com/ics/quartz/task/RepairTask.java +++ b/shoot-hand/ics-quartz/src/main/java/com/ics/quartz/task/RepairTask.java @@ -1,9 +1,9 @@ package com.ics.quartz.task; import com.ics.admin.service.IRepairService; +import com.ics.common.utils.spring.SpringUtils; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; /** * created at 2024-8-13 14:11 @@ -13,23 +13,26 @@ import org.springframework.stereotype.Component; * @since 1.0.0 */ @Slf4j -@Component("repairTask") +@Service("repairTask") public class RepairTask { - @Autowired - private IRepairService repairService; - /** * 工单超时预警 */ - public void repairTimeOut(){ - System.out.println("========come on time out========="); + public void repairTimeOut() { + IRepairService repairService = SpringUtils.getBean(IRepairService.class); + int num = repairService.repairTimeOutWarn(); + log.info("已对" + num + "个工单超时预警"); + num = repairService.removeWarn(); + log.info("已对" + num + "个工单解除预警"); } /** * 工单完成7天后未评价 则 自动好评 */ public void repairGoodEval() { - System.out.println("========come on give me five========="); + IRepairService repairService = SpringUtils.getBean(IRepairService.class); + int num = repairService.repairGoodEval(); + log.info("已对" + num + "个工单自动五星好评"); } } diff --git a/shoot-hand/ics-system/src/main/java/com/ics/system/handlers/MyParkLineHandler.java b/shoot-hand/ics-system/src/main/java/com/ics/system/handlers/MyParkLineHandler.java index 313c18a..4fd222a 100644 --- a/shoot-hand/ics-system/src/main/java/com/ics/system/handlers/MyParkLineHandler.java +++ b/shoot-hand/ics-system/src/main/java/com/ics/system/handlers/MyParkLineHandler.java @@ -24,7 +24,7 @@ public class MyParkLineHandler implements TenantLineHandler { "sys_sn", "sys_user_role", "sys_dept", "ics_customer_contract_room", "ics_park", "ics_apply_room", "ics_customer_contract_refund_room", "ics_apply_park_file", "ics_apply_settle_file", "ics_apply_move_in_file", "ics_activity","ics_customer_staff","tb_customer_ticket","tb_reservation","tb_reservation_person", "tb_room_content","tb_room_item","tb_room_item_by_room","tb_room_serve_by_room","tb_room_serve","tb_equipment","tb_staff_customer", - "tb_room_equipment","tb_room_record","tb_room_serve","tb_showroom","tb_showroom_record","tb_ticket","tb_user_equipment","tb_visitor_person" + "tb_room_equipment","tb_room_record","tb_room_serve","tb_showroom","tb_showroom_record","tb_ticket","tb_user_equipment","tb_visitor_person","ics_repair" }; /** diff --git a/shoot-hand/ics-system/src/main/java/com/ics/system/handlers/MyTenantLineHandler.java b/shoot-hand/ics-system/src/main/java/com/ics/system/handlers/MyTenantLineHandler.java index bd53491..eea4a29 100644 --- a/shoot-hand/ics-system/src/main/java/com/ics/system/handlers/MyTenantLineHandler.java +++ b/shoot-hand/ics-system/src/main/java/com/ics/system/handlers/MyTenantLineHandler.java @@ -24,7 +24,7 @@ public class MyTenantLineHandler implements TenantLineHandler { "sys_sn", "sys_user_role", "ics_customer_contract_room", "ics_apply_room", "ics_customer_contract_refund_room", "ics_apply_park_file", "ics_apply_settle_file", "ics_apply_move_in_file", "ics_activity","ics_customer_staff","tb_customer_ticket","tb_reservation","tb_reservation_person", "tb_room_content","tb_room_item","tb_room_item_by_room","tb_room_serve_by_room","tb_room_serve","tb_equipment","tb_staff_customer", - "tb_room_equipment","tb_room_record","tb_room_serve","tb_showroom","tb_showroom_record","tb_ticket","tb_user_equipment","tb_visitor_person" + "tb_room_equipment","tb_room_record","tb_room_serve","tb_showroom","tb_showroom_record","tb_ticket","tb_user_equipment","tb_visitor_person","ics_repair" }; /** diff --git a/shoot-hand/ics-web/src/main/java/com/ics/controller/mobile/member/RepairAPIController.java b/shoot-hand/ics-web/src/main/java/com/ics/controller/mobile/member/RepairAPIController.java deleted file mode 100644 index 5502a83..0000000 --- a/shoot-hand/ics-web/src/main/java/com/ics/controller/mobile/member/RepairAPIController.java +++ /dev/null @@ -1,438 +0,0 @@ -package com.ics.controller.mobile.member; - -import com.google.common.collect.Maps; - -import com.ics.admin.domain.*; -import com.ics.admin.service.*; -import com.ics.common.core.controller.BaseController; -import com.ics.common.core.domain.R; -import com.ics.service.IRepairService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.wf.jwtp.annotation.Ignore; -import org.wf.jwtp.annotation.RequiresPermissions; - -import java.util.Map; - -/** - * 工单管理 - * - * @author jack - */ -@RestController -@RequestMapping("/repair") -public class RepairAPIController extends BaseController { - - - @Autowired - private IRepairService repairService; - @Autowired - private IIcsCustomerStaffService icsCustomerStaffService; - - @Autowired - private IRepairDeviceService repairDeviceService; - - @Autowired - private IRepairRelationalService staffTypeService; - - @Autowired - private IRepairDeviceTypeService repairTypeService; - - @Autowired - private IRepairAttachService workerTypeService; - - @Autowired - private IRepairAddressService repairAddressService; - - @Autowired - private IRepairAddressFloorService repairRoomService; - - @Autowired - private IIcsCustomerStaffService customerStaffService; - - @Autowired - private IRepairDeviceService deviceService; - - @Autowired - private IRepairFailureTypeService repairFailureTypeService; - - - - /** - * 查询工单管理 - */ -// @RequiresPermissions("member:center:view") -// @Ignore -// @GetMapping("get/{id}") -// public R get(@PathVariable("id") Long id) { -// Repair repair = repairService.selectRepairById(id); -// if (repair != null) { -// repair.setStatusValue(repair.getStatus().getValue()); -// -// //设备名称 -// RepairDevice repairDevice = repairDeviceService.selectRepairDeviceById(Long.valueOf(repair.getRepairDevice())); -// if (repairDevice != null) { -// repair.setRepairDeviceName(repairDevice.getName()); -// } -// //维修人 -// Long workerId = repair.getWorkerId(); -// IcsCustomerStaff icsCustomerStaff = icsCustomerStaffService.selectIcsCustomerStaffById(workerId); -// if (icsCustomerStaff != null) { -// repair.setWorkerName(icsCustomerStaff.getName()); -// } -// } -// return R.data(repair); -// } - - /** - * 查询工单管理列表 - */ -// @RequiresPermissions("member:center:view") -// @GetMapping("list") -// public R list(Repair.Status status, Long parkId) { -// long currentUserId = getCurrentUserId(); -// IcsCustomerStaff staff = icsCustomerStaffService.selectIcsCustomerStaffById(currentUserId); -// Repair repair = new Repair(); -// repair.setStatus(status); -// repair.setCreateBy(staff.getUsername()); -// repair.setParkId(1L); -// startPage(); -// List repairList = repairService.selectMyRepairList(repair); -// List> repairVOList = Lists.newArrayList(); -// repairList.stream().forEach(item ->{ -// Map map = Maps.newHashMap(); -// map.put("id", item.getId()); -// map.put("sn", item.getSn()); -// map.put("repairTime", item.getRepairTime()); -// map.put("area", item.getArea()); -// map.put("content", item.getContent()); -// map.put("status",item.getStatus()); -// repairVOList.add(map); -// }); -// return result(repairVOList); -// } - - - /** - * 添加 - */ - @RequiresPermissions("member:center:view") - @GetMapping("/add") - public R add() { - Map map = Maps.newHashMap(); - long currentUserId = getCurrentUserId(); -// IcsCustomerStaff staff = icsCustomerStaffService.selectIcsCustomerStaffById(currentUserId); - -// map.put("userId", staff.getId()); -// map.put("mobile", staff.getMobile()); -// map.put("username", staff.getUsername()); - map.put("area", ""); - map.put("content", ""); - return R.data(map); - } - - /** - * 新增保存工单管理 - */ -// @RequiresPermissions("member:center:view") -// @Ignore -// @PostMapping("save") -// public R addSave(@RequestBody Repair repair) { -// -// //获取用户id -// ValidatorUtils.validateEntity(repair); -// repair.setStatus(Repair.Status.PENDING_ASSIGN); -// return toAjax(repairService.insertRepair(repair)); -// } - - /** - * 获取设备分类列表 - * @param - * @return - */ -// @Ignore -// @GetMapping("deviceTypeList") -// public R deviceTypeList(RepairDeviceType repairType) { -// return result(repairTypeService.selectRepairTypeList(repairType)); -// } - - @Ignore - @GetMapping("deviceList") - public R deviceList(RepairDevice repairDevice) { - return result(repairDeviceService.selectRepairDeviceList(repairDevice)); - } - - @Ignore - @GetMapping("selectAddressList") - public R selectAddressList(RepairAddress repairAddress) { - return result(repairAddressService.selectRepairAddressList(repairAddress)); - } - - @Ignore - @GetMapping("selectRoomList") - public R selectRoomList(RepairAddressFloor repairRoom) { - //return result(repairRoomService.selectRepairRoomList(repairRoom)); - return null; - } - - - - - /** - * 用户评价工单 - */ -// @RequiresPermissions("member:center:view") -// @Ignore -// @PostMapping("review") -// public R review(@RequestBody RepairEval repairRecord) { -// Repair pRepair = repairService.selectRepairById(repairRecord.getId()); -// if (repairRecord == null || !Repair.Status.COMPLETED.equals(pRepair.getStatus())) { -// return R.error("报修为空或状态已完成"); -// } -// pRepair.setStatus(Repair.Status.SCORE); -// //修改工单状态 -// int i = repairService.updateRepair(pRepair); -// //新增评价 -// repairRecord.setCreateTime(DateUtils.getNowDate()); -// repairRecord.setDeleteFlag(0); -// int count = repairRecordService.insertRepairRecord(repairRecord); -// -// return toAjax(i); -// } - - - /** - * 用户取消工单 - */ -// @RequiresPermissions("member:center:view") -// @GetMapping("cancel") -// public R cancel(Long repairId) { -// Repair repair = repairService.selectRepairById(repairId); -// if (repair == null || !Repair.Status.PENDING_PROCESS.equals(repair.getStatus())) { -// return R.error("报修为空或状态不是待处理"); -// } -// repair.setStatus(Repair.Status.CANCELED); -// repair.setUpdateBy(getLoginName()); -// return toAjax(repairService.updateRepair(repair)); -// } - - - /** - * 根据用户id或者保修记录 - */ - -// @Ignore -// @GetMapping("/listByUserId") -// public R listByUserId(Long userId,Integer status) { -// List repair = repairService.selectByUserId(userId,status); -// for (Repair repair1 : repair) { -// RepairDevice repairDevice = repairDeviceService.selectRepairDeviceById(Long.valueOf(repair1.getRepairDevice())); -// if (repairDevice != null) { -// repair1.setRepairDeviceName(repairDevice.getName()); -// } -// } -// return R.data(repair); -// } - - /*-------------------------以下为派单员接口------------------------*/ - - /** - * 派单中心列表 - */ -// @Ignore -// @PostMapping("/dispatcherList") -// public R dispatcherList(@RequestBody Repair repair) { -// Integer userId = repair.getUserId(); -// Integer statusValue = repair.getStatusValue(); -// -// //根据用户id查询绑定的设备分类 -// Long type = staffTypeService.selectRepairTypeByUserId(userId); -// //根据设备分类和状态查询对应的数据 -// PageDomain pageDomain = TableSupport.buildPageRequest(); -// -// Integer pageNum = pageDomain.getPageNum(); -// Integer pageSize = pageDomain.getPageSize(); -// IPage repairList = repairService.selectRepairListByType(type,statusValue,pageNum,pageSize); -// for (Repair repair1 : repairList.getRecords()) { -// repair1.setStatusValue(repair1.getStatus().getValue()); -// repair1.setStatusName(repair1.getStatus().getName()); -// //设备类型 -// if (repair1.getTypeId() != null) { -// RepairDeviceType repairType = repairTypeService.selectRepairTypeById(Long.valueOf(repair1.getTypeId())); -// repair1.setTypeName(repairType.getName()); -// } -// //设备名称 -// if (repair1.getRepairDevice() != null){ -// RepairDevice repairDevice = deviceService.selectRepairDeviceById(Long.valueOf(repair1.getRepairDevice())); -// repair1.setRepairDeviceName(repairDevice.getName()); -// } -// //地点 -// if (repair1.getAddressId() !=null){ -// RepairAddress repairAddress = repairAddressService.selectRepairAddressById(repair1.getAddressId()); -// repair1.setAddressName(repairAddress.getName()); -// } -// //楼层 -// if (repair1.getRoomId() !=null){ -// RepairAddressFloor repairRoom = repairRoomService.selectRepairRoomById(repair1.getRoomId()); -// repair1.setRoomName(repairRoom.getName()); -// } -// //故障 -// if (repair1.getFailureTypeId() != null){ -// -// RepairFailureType repairFailureType = repairFailureTypeService.selectRepairFailureTypeById(repair1.getFailureTypeId()); -// repair1.setFailureTypeName(repairFailureType.getName()); -// } -// if (repair1.getUserId() != null){ -// IcsCustomerStaff staff = customerStaffService.selectIcsCustomerStaffById(Long.valueOf(repair1.getUserId())); -// repair1.setUserName(staff.getUsername()); -// } -// -// if (repair1.getWorkerId() != null){ -// IcsCustomerStaff worker = customerStaffService.selectIcsCustomerStaffById(repair1.getWorkerId()); -// repair1.setWorkerName(worker.getUsername()); -// } -// } -// -// return R.ok().put("data",repairList); -// } - - //无效申请 取消派单 -// @Ignore -// @PostMapping("dispatcherCancel") -// public R dispatcherCancel(Long repairId) { -// Repair repair = repairService.selectRepairById(repairId); -// if (repair == null || !Repair.Status.PENDING_ASSIGN.equals(repair.getStatus())) { -// return R.error("报修为空或状态不是待分配"); -// } -// repair.setStatus(Repair.Status.CANCELED); -// return toAjax(repairService.updateRepair(repair)); -// } -// -// //提交反馈 -// @Ignore -// @PostMapping("dispatcherSubmitFeedback") -// public R dispatcherSubmitFeedback(Long repairId) { -// Repair repair = repairService.selectRepairById(repairId); -// if (repair == null || !Repair.Status.PENDING_ASSIGN.equals(repair.getStatus())) { -// return R.error("报修为空或状态不是待分配"); -// } -// repair.setStatus(Repair.Status.SUBMIT_FEEDBACK); -// return toAjax(repairService.updateRepair(repair)); -// } -// -// //选择维修人员 -// @Ignore -// @GetMapping("selectDispatcherChooseWorker") -// public R dispatcherChooseWorker(@RequestBody Map map) { -// Integer userId = (Integer) map.get("userId"); -// -// //根据用户id查询绑定的设备分类 -// Long type = staffTypeService.selectRepairTypeByUserId(userId); -// //根据设备分类查询对应的维修人员列表 -// List customerStaffs = workerTypeService.selectRepairWorkerTypeListByTypeId(type); -// -// return R.data(customerStaffs); -// } -// -// -// //提交派单人员 -// @Ignore -// @GetMapping("dispatcherPendingProcess") -// public R dispatcherPendingProcess(@RequestBody Repair repair) { -// Repair repair1 = repairService.selectRepairById(repair.getId()); -// if (repair1 == null || !Repair.Status.PENDING_ASSIGN.equals(repair.getStatus())) { -// return R.error("报修为空或状态不是待分配"); -// } -// repair1.setStatus(Repair.Status.PENDING_PROCESS); -// repair1.setWorkerId(repair.getWorkerId()); -// repair1.setBeginDate(DateUtils.getNowDate()); -// return toAjax(repairService.updateRepair(repair1)); -// } -// -// /*-------------------------以下为维修人员接口------------------------*/ -// -// /** -// * 维修人员工单管理 -// * @param userId -// * @param status -// * @return -// */ -// @Ignore -// @GetMapping("/listByWorkerId") -// public R listByWorkerId(Long userId,Integer status) { -// -// -// //待完成 状态为 1 -// Integer beCompleted = repairService.listByWorkerIdByCount(userId,1); -// -// //进行中 状态为4 -// Integer ongoing = repairService.listByWorkerIdByCount(userId,4); -// -// //已完成 -// Integer done2 = repairService.listByWorkerIdByCount(userId,5); -// Integer done1 = repairService.listByWorkerIdByCount(userId,6); -// -// Map map = new HashMap<>(); -// map.put("beCompleted",beCompleted); -// map.put("ongoing",ongoing); -// map.put("done",done1+done2); -// -// -// // 待完成 1 进行中 2 已完成 3 -// List repair = repairService.listByWorkerId(userId,status); -// for (Repair repair1 : repair) { -// RepairDevice repairDevice = repairDeviceService.selectRepairDeviceById(Long.valueOf(repair1.getRepairDevice())); -// if (repairDevice != null) { -// repair1.setRepairDeviceName(repairDevice.getName()); -// } -// } -// map.put("repair",repair); -// return R.data(map); -// } -// -// /** -// * 维修人员工单详情 -// */ -// -// @Ignore -// @GetMapping("/detailByWorkerId") -// public R detailByWorkerId(Long repairId) { -// Repair repair = repairService.selectRepairById(repairId); -// if (repair == null) { -// return R.error("报修为空"); -// } -// Integer repairDevice = repair.getRepairDevice(); -// if (repairDevice != null) { -// RepairDevice repairDevice1 = repairDeviceService.selectRepairDeviceById(Long.valueOf(repairDevice)); -// repair.setRepairDeviceName(repairDevice1.getName()); -// } -// //派单员id 查找对应名称 -// IcsCustomerStaff icsCustomerStaff = icsCustomerStaffService.selectIcsCustomerStaffById(Long.valueOf(repair.getDispatcherId())); -// if (icsCustomerStaff != null) { -// repair.setDispatcherName(icsCustomerStaff.getName()); -// } -// //报修人id 查找对应名称 -// IcsCustomerStaff staff = icsCustomerStaffService.selectIcsCustomerStaffById(Long.valueOf(repair.getUserId())); -// if (staff != null) { -// repair.setUserName(icsCustomerStaff.getName()); -// } -// return R.data(repair); -// } -// -// /** -// * 维修人员确认接单 -// */ -// @Ignore -// @PostMapping("/confirmOrder") -// public R confirmOrder(Long repairId) { -// Repair repair = repairService.selectRepairById(repairId); -// repair.setStatus(Repair.Status.PROCESSING); -// repair.setBeginDate(DateUtils.getNowDate()); -// repairService.updateRepair(repair); -// return R.ok(); -// } - - - -} - diff --git a/shoot-hand/ics-web/src/main/java/com/ics/service/IRepairLogService.java b/shoot-hand/ics-web/src/main/java/com/ics/service/IRepairLogService.java deleted file mode 100644 index e4570b2..0000000 --- a/shoot-hand/ics-web/src/main/java/com/ics/service/IRepairLogService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.ics.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.ics.admin.domain.RepairLog; - -import java.util.List; - -/** - * 报修记录Service接口 - * - * @author ics - * @date 2021-03-25 - */ -public interface IRepairLogService extends IService { - - /** - * 查询报修记录列表 - * - * @param repairLog 报修记录 - * @return 报修记录集合 - */ - List selectRepairLogList(RepairLog repairLog); - - -} diff --git a/shoot-hand/ics-web/src/main/java/com/ics/service/IRepairService.java b/shoot-hand/ics-web/src/main/java/com/ics/service/IRepairService.java deleted file mode 100644 index 0ec90b0..0000000 --- a/shoot-hand/ics-web/src/main/java/com/ics/service/IRepairService.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.ics.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.ics.admin.domain.Repair; -import com.ics.admin.vo.RepairVO; - -import java.util.List; - -/** - * 工单管理Service接口 - * - * @author ics - * @date 2021-03-25 - */ -public interface IRepairService extends IService { - /** - * 查询工单管理 - * - * @param id 工单管理ID - * @return 工单管理 - */ - Repair selectRepairById(Long id); - - - /** - * 新增工单管理 - * - * @param repair 工单管理 - * @return 结果 - */ - int insertRepair(Repair repair); - - /** - * 修改工单管理 - * - * @param repair 工单管理 - * @return 结果 - */ - int updateRepair(Repair repair); - - - /** - * 查询我的工单管理列表 - * - * @param repair 创建用户 - * @return 工单管理集合 - */ - List selectMyRepairList(Repair repair); - - List selectByUserId(Long userId,Integer status); - - IPage selectRepairListByType(Long type, Integer status, Integer pageNum, Integer pageSize); - - List listByWorkerId(Long userId, Integer status); - - Integer listByWorkerIdByCount(Long userId, Integer status); -} diff --git a/shoot-hand/ics-web/src/main/java/com/ics/service/impl/RepairLogServiceImpl.java b/shoot-hand/ics-web/src/main/java/com/ics/service/impl/RepairLogServiceImpl.java deleted file mode 100644 index 1e3979f..0000000 --- a/shoot-hand/ics-web/src/main/java/com/ics/service/impl/RepairLogServiceImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.ics.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ics.admin.domain.RepairLog; -import com.ics.admin.mapper.RepairLogMapper; -import com.ics.service.IRepairLogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 报修记录Service业务层处理 - * - * @author ics - * @date 2021-03-25 - */ -@Service("repairLogAppService") -public class RepairLogServiceImpl extends ServiceImpl implements IRepairLogService { - @Autowired - private RepairLogMapper repairLogMapper; - - - - /** - * 查询报修记录列表 - * - * @param repairLog 报修记录 - * @return 报修记录 - */ - @Override - public List selectRepairLogList(RepairLog repairLog) { - //return repairLogMapper.selectRepairLogList(repairLog); - return null; - } - - -} diff --git a/shoot-hand/ics-web/src/main/java/com/ics/service/impl/RepairServiceImpl.java b/shoot-hand/ics-web/src/main/java/com/ics/service/impl/RepairServiceImpl.java deleted file mode 100644 index 39f4327..0000000 --- a/shoot-hand/ics-web/src/main/java/com/ics/service/impl/RepairServiceImpl.java +++ /dev/null @@ -1,185 +0,0 @@ -package com.ics.service.impl; - -import cn.hutool.core.collection.CollUtil; -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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ics.admin.domain.Repair; -import com.ics.admin.domain.RepairLog; -import com.ics.admin.domain.meeting.Reservation; -import com.ics.admin.mapper.RepairMapper; -import com.ics.admin.service.IRepairLogService; -import com.ics.admin.vo.RepairVO; -import com.ics.service.IRepairService; -import com.ics.common.utils.DateUtils; -import com.ics.system.domain.Sn; -import com.ics.system.service.ICurrentUserService; -import com.ics.system.service.ISnService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * 工单管理Service业务层处理 - * - * @author ics - * @date 2021-03-25 - */ -@Service("repairAppService") -public class RepairServiceImpl extends ServiceImpl implements IRepairService { - @Autowired - private RepairMapper repairMapper; - - @Autowired - private ISnService snService; - - @Autowired - private IRepairLogService repairLogService; - - - /** - * 查询工单管理 - * - * @param id 工单管理ID - * @return 工单管理 - */ - @Override - public Repair selectRepairById(Long id) { - return repairMapper.selectRepairById(id); - } - - - /** - * 新增工单管理 - * - * @param repair 工单管理 - * @return 结果 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public int insertRepair(Repair repair) { -// repair.setSn(snService.generate(Sn.Type.REPAIR)); -// repair.setCreateTime(DateUtils.getNowDate()); -// repair.setRepairTime(DateUtils.getNowDate()); -// int result = repairMapper.insert(repair); -// // 增加报修日志 -// RepairLog repairLog = new RepairLog(); -// repairLog.setType(repair.getStatus()); -// repairLog.setDetail(String.format("工单号：%s,已收到报修", repair.getSn())); -// repairLog.setRepairId(repair.getId()); -// repairLog.setCreateBy(repair.getCreateBy()); -// repairLog.setCreateTime(DateUtils.getNowDate()); -// repairLog.setUpdateBy(repair.getCreateBy()); -// repairLog.setUpdateTime(DateUtils.getNowDate()); -// repairLog.setParkId(repair.getParkId()); -// repairLog.setTenantId(repair.getTenantId()); -// repairLogService.insertRepairLog(repairLog); -// return result; - return 0; - } - - /** - * 修改工单管理 - * - * @param repair 工单管理 - * @return 结果 - */ - @Override - public int updateRepair(Repair repair) { - // 增加报修日志 -// RepairLog repairLog = new RepairLog(); -// repairLog.setType(repair.getStatus()); -// repairLog.setDetail(repair.getStatus().getName()); -// repairLog.setRepairId(repair.getId()); -// repairLog.setCreateBy(repair.getUpdateBy()); -// repairLog.setCreateTime(DateUtils.getNowDate()); -// repairLog.setUpdateBy(repair.getUpdateBy()); -// repairLog.setUpdateTime(DateUtils.getNowDate()); -// repairLogService.insertRepairLog(repairLog); -// return repairMapper.updateById(repair); - return 0; - } - - - - /** - * 查询工单管理列表 - * - * @param repair 工单管理 - * @return 工单管理 - */ - @Override - public List selectMyRepairList(Repair repair) { - //return repairMapper.selectMyRepairList(repair); - return null; - } - - @Override - public List selectByUserId(Long userId,Integer status) { -// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); -// wrapper.eq(Repair::getUserId, userId); -// wrapper.orderByAsc(Repair::getRepairTime); -// if (status != null && status != 0) { -// wrapper.eq(Repair::getStatus, status); -// } -// -// return repairMapper.selectList(wrapper); - - return null; - } - - @Override - public IPage selectRepairListByType(Long type, Integer status, Integer pageNum, Integer pageSize) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Repair::getTypeId, type); - if ( status == 0) { - wrapper.eq(Repair::getStatus, 2); - }else if (status == 1){ - wrapper.eq(Repair::getStatus, 1); - }else if (status == 2){ - wrapper.eq(Repair::getStatus, 3).or().eq(Repair::getStatus, 4); - }else if (status == 3){ - wrapper.eq(Repair::getStatus, 5).or().eq(Repair::getStatus, 6).or().eq(Repair::getStatus, 7); - } - IPage pages = new Page<>(pageNum,pageSize); - IPage userIPage = baseMapper.selectPage(pages,wrapper); - return userIPage; - } - - @Override - public List listByWorkerId(Long userId, Integer status) { -// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); -// wrapper.eq(Repair::getWorkerId, userId); -// wrapper.orderByAsc(Repair::getRepairTime); -// if ( status == 1) { -// wrapper.eq(Repair::getStatus, 1); -// }else if (status == 1){ -// wrapper.eq(Repair::getStatus, 4); -// }else if (status == 2){ -// wrapper.eq(Repair::getStatus,5 ).or().eq(Repair::getStatus, 6); -// } -// -// return repairMapper.selectList(wrapper); - return null; - - } - - @Override - public Integer listByWorkerIdByCount(Long userId, Integer status) { -// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); -// wrapper.eq(Repair::getWorkerId, userId); -// wrapper.orderByAsc(Repair::getRepairTime); -// if (status != null && status != 0) { -// wrapper.eq(Repair::getStatus, status); -// } -// -// return repairMapper.selectCount(wrapper); - - return 0; - - } - -}