diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/TerminalQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/TerminalQuery.java index 8e6c15c..04bbc8f 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/TerminalQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/TerminalQuery.java @@ -117,4 +117,10 @@ public class TerminalQuery extends CommonParam { */ @Condition(name = "`project_id`", type = Condition.ConditionType.eq, tableName = "p") private Long projectId; + + /** + * 用户id + */ + @Condition(name = "`user_id`", type = Condition.ConditionType.eq, tableName = "i") + private Long userId; } diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/StoreTerminalVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/StoreTerminalVO.java index eec1f25..d38d6bc 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/StoreTerminalVO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/StoreTerminalVO.java @@ -2,6 +2,7 @@ package com.chushang.inspection.terminal.vo; import cn.hutool.core.date.DatePattern; import com.alibaba.excel.annotation.format.DateTimeFormat; +import com.baomidou.mybatisplus.annotation.TableField; import com.chushang.common.dict.annotation.DictFormat; import lombok.Data; @@ -200,5 +201,35 @@ public class StoreTerminalVO { private String deptName; + /** + * 上次服务结果 + */ + @DictFormat(dictType = "service_results") + private Integer serviceResult; + + /** + * 审核通过次数 + */ + private Integer timesPass; + + /** + * 地理位置信息地址 + */ + private String geographicAddress; + + /** + * 巡检位置信息 + */ + private String workLocation; + /** + * 地理位置信息 + */ + private String geographicLocation; + + /** + * 地理位置信息地址 + */ + private String workAddress; + } diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoDispatch.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoDispatch.java new file mode 100644 index 0000000..67b25d0 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoDispatch.java @@ -0,0 +1,34 @@ +package com.chushang.inspection.work.po; + +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.chushang.common.mybatis.base.BaseEntity; +import lombok.*; + +/** + * @auther: zhao + * @date: 2024/7/4 10:13 + */ +@Data +@EqualsAndHashCode(callSuper=true) +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "wrk_info_dispatch") +@Builder +public class WrkInfoDispatch extends BaseEntity { + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + @TableField("wrk_id") + private Long wrkId; + @TableField("user_id") + private Long userId; + @TableField("dept_id") + private Long deptId; + /** + * 派单状态 + */ + @TableField("dis_status") + private Integer disStatus; +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/TerminalController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/TerminalController.java index 2f40340..afa50c9 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/TerminalController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/TerminalController.java @@ -29,10 +29,11 @@ public class TerminalController { TerminalService terminalService; /** + * // 之前在这里是派单 * 商户终端池 * @param query 条件 */ - @SysLog(value = "终端", businessType = BusinessType.QUERY) + @SysLog(value = "终端池", businessType = BusinessType.QUERY) @GetMapping("/page") @RequiresPermissions("ins:terminal:page") public AjaxResult pageList(@Validated TerminalQuery query) { diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoTerminalRecordController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoTerminalRecordController.java index 698b135..eb38dba 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoTerminalRecordController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoTerminalRecordController.java @@ -1,12 +1,42 @@ package com.chushang.inspection.work.controller; +import com.chushang.common.core.web.AjaxResult; +import com.chushang.common.log.annotation.SysLog; +import com.chushang.common.log.enums.BusinessType; +import com.chushang.inspection.terminal.query.TerminalQuery; +import com.chushang.inspection.work.service.WrkInfoTerminalRecordService; +import com.chushang.security.annotation.RequiresPermissions; +import com.chushang.security.utils.SecurityUtils; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; + /** * 工单终端信息(wrk_info_terminal_record)表控制层 * * @author xxxxx */ @RestController -@RequestMapping("/wrk_info_terminal_record") +@RequestMapping("/wrk/info/terminal") public class WrkInfoTerminalRecordController { + + /** + * 我的终端池 + */ + @Resource + private WrkInfoTerminalRecordService terminalRecordService; + + /** + * 商户终端池 + * @param query 条件 + */ + @SysLog(value = "我的终端池", businessType = BusinessType.QUERY) + @GetMapping("/mine/page") + @RequiresPermissions("ins:terminal:mine") + public AjaxResult minePageList(@Validated TerminalQuery query) { + // 获取当前用户的 + query.setUserId(SecurityUtils.getUserId()); + return AjaxResult.success(terminalRecordService.minePageList(query)); + } + } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoDispatchMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoDispatchMapper.java new file mode 100644 index 0000000..9a84ce3 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoDispatchMapper.java @@ -0,0 +1,11 @@ +package com.chushang.inspection.work.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.chushang.inspection.work.po.WrkInfoDispatch; + +/** + * @auther: zhao + * @date: 2024/7/4 10:16 + */ +public interface WrkInfoDispatchMapper extends BaseMapper { +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoTerminalRecordMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoTerminalRecordMapper.java index a6ed9ab..4fd4a42 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoTerminalRecordMapper.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoTerminalRecordMapper.java @@ -1,11 +1,21 @@ package com.chushang.inspection.work.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chushang.datascope.annotation.DataScope; +import com.chushang.inspection.terminal.query.TerminalQuery; +import com.chushang.inspection.terminal.vo.StoreTerminalVO; import com.chushang.inspection.work.po.WrkInfoTerminalRecord; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @auther: zhao * @date: 2024/6/26 17:13 */ public interface WrkInfoTerminalRecordMapper extends BaseMapper { + @DataScope(deptAlias = "i") + List minePageList(@Param("query") TerminalQuery query, + Page page); } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoDispatch.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoDispatch.java index eee9121..0e17821 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoDispatch.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoDispatch.java @@ -1,26 +1,26 @@ -package com.chushang.inspection.work.service; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.IdUtil; -import com.chushang.inspection.work.dto.DispatchDTO; -import com.chushang.inspection.work.po.WrkInfo; -import com.chushang.inspection.work.query.DispatchQuery; - -import java.util.List; - -public interface WrkInfoDispatch { - - List dispatch(DispatchQuery query, List dispatch); - - default WrkInfo construct(DispatchQuery query, DispatchDTO record, String nickName, Long userId) { - WrkInfo info = WrkInfo.builder().endTime(query.getEndTime() == null ? null : query.getEndTime()) - .wrkStatus(1).workType(query.getWorkType()) - .workNo(IdUtil.getSnowflake().nextId()) - .remark(query.getRemark()).workSort(query.getWorkSort()) - .userId(userId).workSource(query.getWorkSource()) - // 业务员名称 不随着用户表名称变化而变化 - .userName(nickName).build(); - BeanUtil.copyProperties(record, info); - return info; - } -} +//package com.chushang.inspection.work.service; +// +//import cn.hutool.core.bean.BeanUtil; +//import cn.hutool.core.util.IdUtil; +//import com.chushang.inspection.work.dto.DispatchDTO; +//import com.chushang.inspection.work.po.WrkInfo; +//import com.chushang.inspection.work.query.DispatchQuery; +// +//import java.util.List; +// +//public interface WrkInfoDispatch { +// +// List dispatch(DispatchQuery query, List dispatch); +// +// default WrkInfo construct(DispatchQuery query, DispatchDTO record, String nickName, Long userId) { +// WrkInfo info = WrkInfo.builder().endTime(query.getEndTime() == null ? null : query.getEndTime()) +// .wrkStatus(1).workType(query.getWorkType()) +// .workNo(IdUtil.getSnowflake().nextId()) +// .remark(query.getRemark()).workSort(query.getWorkSort()) +// .userId(userId).workSource(query.getWorkSource()) +// // 业务员名称 不随着用户表名称变化而变化 +// .userName(nickName).build(); +// BeanUtil.copyProperties(record, info); +// return info; +// } +//} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoDispatchService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoDispatchService.java new file mode 100644 index 0000000..e585a6b --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoDispatchService.java @@ -0,0 +1,11 @@ +package com.chushang.inspection.work.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.chushang.inspection.work.po.WrkInfoDispatch; + +/** + * @auther: zhao + * @date: 2024/7/4 10:31 + */ +public interface WrkInfoDispatchService extends IService { +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoTerminalRecordService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoTerminalRecordService.java index e7cb04c..7df4942 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoTerminalRecordService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoTerminalRecordService.java @@ -1,12 +1,15 @@ package com.chushang.inspection.work.service; +import com.chushang.common.mybatis.utils.PageResult; +import com.chushang.inspection.terminal.query.TerminalQuery; import com.chushang.inspection.work.po.WrkInfoTerminalRecord; import com.baomidou.mybatisplus.extension.service.IService; - /** - * @auther: zhao - * @date: 2024/6/26 17:13 - */ -public interface WrkInfoTerminalRecordService extends IService{ +/** + * @auther: zhao + * @date: 2024/6/26 17:13 + */ +public interface WrkInfoTerminalRecordService extends IService { + PageResult minePageList(TerminalQuery query); } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoDispatchServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoDispatchServiceImpl.java new file mode 100644 index 0000000..69993e4 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoDispatchServiceImpl.java @@ -0,0 +1,17 @@ +package com.chushang.inspection.work.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.chushang.inspection.work.mapper.WrkInfoDispatchMapper; +import com.chushang.inspection.work.po.WrkInfoDispatch; +import com.chushang.inspection.work.service.WrkInfoDispatchService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @auther: zhao + * @date: 2024/7/4 10:34 + */ +@Slf4j +@Service +public class WrkInfoDispatchServiceImpl extends ServiceImpl implements WrkInfoDispatchService { +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java index 14981f0..7ed4e13 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java @@ -308,13 +308,14 @@ public class WrkInfoServiceImpl extends ServiceImpl impl tempStorageTerminalInsRecord.setInspectionStatus(1); tempStorageTerminalInsRecord.setInspectionTime(now); + // 这块 可能为新增商户以及终端信息 // 更新商户 信息, 同时 也需要更新 // 更新商户状态 - storeService.updateById(store); + storeService.saveOrUpdate(store); // 更新终端状态 - terminalService.updateById(terminal); + terminalService.saveOrUpdate(terminal); // 更新终端巡检时间以及审核通过次数等 - terminalInsService.updateById(terminalIns); + terminalInsService.saveOrUpdate(terminalIns); // 还需要 更改 记录表对应的数据. } // 需要初审 @@ -497,7 +498,8 @@ public class WrkInfoServiceImpl extends ServiceImpl impl wrkInfoStoreRecordService.save(wrkInfoStoreRecord); } } - }else if(method.equals(1) || method.equals(2)){ + } + else if(method.equals(1) || method.equals(2)){ Assert.notNull(query.getUserId(), "需要指定业务员"); Result result = userFeignService.getInfoById(query.getUserId(), SecurityConstants.INNER); if(result.isSuccess()){ @@ -522,5 +524,6 @@ public class WrkInfoServiceImpl extends ServiceImpl impl } } } + // } } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoTerminalRecordServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoTerminalRecordServiceImpl.java index 170b160..17a9199 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoTerminalRecordServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoTerminalRecordServiceImpl.java @@ -1,16 +1,54 @@ package com.chushang.inspection.work.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chushang.common.core.constant.SecurityConstants; +import com.chushang.common.mybatis.page.CommonParam; +import com.chushang.common.mybatis.utils.PageResult; +import com.chushang.common.mybatis.utils.WrapperUtils; +import com.chushang.inspection.terminal.query.TerminalQuery; +import com.chushang.inspection.terminal.vo.StoreTerminalVO; import com.chushang.inspection.work.service.WrkInfoTerminalRecordService; +import com.chushang.system.feign.RemoteDeptService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chushang.inspection.work.mapper.WrkInfoTerminalRecordMapper; import com.chushang.inspection.work.po.WrkInfoTerminalRecord; +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + /** * @auther: zhao * @date: 2024/6/26 17:13 */ +@Slf4j @Service public class WrkInfoTerminalRecordServiceImpl extends ServiceImpl implements WrkInfoTerminalRecordService { - + @Resource + private RemoteDeptService remoteDeptService; + /** + * 我的终端池 + */ + @Override + public PageResult minePageList(TerminalQuery query) { + WrapperUtils.buildSql(query); + CommonParam commonParam = CommonParam.buildPageRequest(); + Page page = new Page<>(commonParam.getPage(), commonParam.getLimit()); + List terminalVOS = baseMapper.minePageList(query, page); + if (CollectionUtil.isNotEmpty(terminalVOS)){ + Set deptIds = + terminalVOS.stream().map(StoreTerminalVO::getDeptId).collect(Collectors.toSet()); + Map deptNameByIds + = remoteDeptService.getDeptNameByIds(deptIds, SecurityConstants.INNER); + if (CollectionUtil.isNotEmpty(deptNameByIds)){ + terminalVOS.forEach(s-> s.setDeptName(deptNameByIds.get(s.getDeptId()))); + } + } + return new PageResult(terminalVOS, page); + } } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml index 710fe5e..9a10445 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml @@ -110,7 +110,7 @@ ti.geographic_address AS geographicAddress, ti.geographic_location AS geographicLocation, ti.work_location AS workLocation, - ti.work_adderss AS workAdderss + ti.work_adderss AS workAddress FROM st_terminal t INNER JOIN st_store s ON t.store_id = s.store_id INNER JOIN st_terminal_ins ti ON t.terminal_id = ti.terminal_id diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoTerminalRecordMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoTerminalRecordMapper.xml new file mode 100644 index 0000000..1d1a23c --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoTerminalRecordMapper.xml @@ -0,0 +1,66 @@ + + + + + +