表名和类名统统换掉

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/PatrolRoutineWorkController.java → epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BaseGridDailyworkController.java

@@ -21,7 +21,7 @@ package com.epmet.opendata.controller;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.opendata.dto.form.UpsertPatrolRecordForm;
-import com.epmet.opendata.service.PatrolRoutineWorkService;
+import com.epmet.opendata.service.BaseGridDailyworkService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -36,11 +36,11 @@ import org.springframework.web.bind.annotation.RestController;
  * @since v1.0.0 2021-12-24
  */
 @RestController
-@RequestMapping("patrolroutinework")
-public class PatrolRoutineWorkController {
+@RequestMapping("basegriddailywork")
+public class BaseGridDailyworkController {
 
     @Autowired
-    private PatrolRoutineWorkService patrolRoutineWorkService;
+    private BaseGridDailyworkService baseGridDailyworkService;
 
 
     /**
@@ -50,7 +50,7 @@ public class PatrolRoutineWorkController {
     @PostMapping("sync")
     public Result getStaffBaseInfo(@RequestBody(required = false) UpsertPatrolRecordForm formDTO) {
         ValidatorUtils.validateEntity(formDTO);
-        patrolRoutineWorkService.insertPatrolRecord(formDTO);
+        baseGridDailyworkService.insertPatrolRecord(formDTO);
         return new Result();
     }
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/InitDataController.java

@@ -18,7 +18,7 @@
 package com.epmet.opendata.controller;
 
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.opendata.service.PatrolRoutineWorkService;
+import com.epmet.opendata.service.BaseGridDailyworkService;
 import com.epmet.opendata.service.UserPatrolRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -40,7 +40,7 @@ public class InitDataController {
     @Autowired
     private UserPatrolRecordService userPatrolRecordService;
     @Autowired
-    private PatrolRoutineWorkService patrolRoutineWorkService;
+    private BaseGridDailyworkService baseGridDailyworkService;
 
     /**
      * @Author sun
@@ -57,6 +57,6 @@ public class InitDataController {
      **/
     @PostMapping("routineWork/{customerId}")
     public Result<Boolean> reloadRoutineWorkData(@PathVariable String customerId) {
-        return new Result().ok(patrolRoutineWorkService.reloadPatrolData(customerId));
+        return new Result().ok(baseGridDailyworkService.reloadPatrolData(customerId));
     }
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/PatrolRoutineWorkDao.java

@@ -19,7 +19,7 @@ package com.epmet.opendata.dao;
 
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.opendata.entity.PatrolRoutineWorkEntity;
+import com.epmet.opendata.entity.BaseGridDailyworkEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -29,6 +29,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @since v1.0.0 2021-12-24
  */
 @Mapper
-public interface PatrolRoutineWorkDao extends BaseDao<PatrolRoutineWorkEntity> {
+public interface PatrolRoutineWorkDao extends BaseDao<BaseGridDailyworkEntity> {
 
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/PatrolRoutineWorkEntity.java → epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseGridDailyworkEntity.java

@@ -32,8 +32,8 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("patrol_routine_work")
-public class PatrolRoutineWorkEntity implements Serializable {
+@TableName("base_grid_dailywork")
+public class BaseGridDailyworkEntity implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java

@@ -11,7 +11,7 @@ import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.constant.SystemMessageType;
 import com.epmet.opendata.dto.form.UpsertPatrolRecordForm;
-import com.epmet.opendata.service.PatrolRoutineWorkService;
+import com.epmet.opendata.service.BaseGridDailyworkService;
 import com.epmet.opendata.service.UserPatrolRecordService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -95,7 +95,7 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr
                     aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).updatePatrolRecord(patrolRecordForm);
                     break;
                 case SystemMessageType.PATROL_ROUTINE_WORK_ADD:
-                    aBoolean = SpringContextUtils.getBean(PatrolRoutineWorkService.class).insertPatrolRecord(patrolRecordForm);
+                    aBoolean = SpringContextUtils.getBean(BaseGridDailyworkService.class).insertPatrolRecord(patrolRecordForm);
                     break;
                 default:
                     log.error("错误的消息类型:{}", tags);

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/PatrolRoutineWorkService.java → epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BaseGridDailyworkService.java

@@ -19,7 +19,7 @@ package com.epmet.opendata.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.opendata.dto.form.UpsertPatrolRecordForm;
-import com.epmet.opendata.entity.PatrolRoutineWorkEntity;
+import com.epmet.opendata.entity.BaseGridDailyworkEntity;
 
 /**
  * 用户巡查主记录
@@ -27,7 +27,7 @@ import com.epmet.opendata.entity.PatrolRoutineWorkEntity;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-10-14
  */
-public interface PatrolRoutineWorkService extends BaseService<PatrolRoutineWorkEntity> {
+public interface BaseGridDailyworkService extends BaseService<BaseGridDailyworkEntity> {
 
     /**
      * desc：根据条件插入巡查记录

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/PatrolRoutingWorkServiceImpl.java → epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java

@@ -32,11 +32,11 @@ import com.epmet.opendata.dao.PatrolRoutineWorkDao;
 import com.epmet.opendata.dto.ExDeptDTO;
 import com.epmet.opendata.dto.ExUserDTO;
 import com.epmet.opendata.dto.form.UpsertPatrolRecordForm;
-import com.epmet.opendata.entity.PatrolRoutineWorkEntity;
+import com.epmet.opendata.entity.BaseGridDailyworkEntity;
 import com.epmet.opendata.entity.UserPatrolDetailEntity;
 import com.epmet.opendata.service.ExDeptService;
 import com.epmet.opendata.service.ExUserService;
-import com.epmet.opendata.service.PatrolRoutineWorkService;
+import com.epmet.opendata.service.BaseGridDailyworkService;
 import com.epmet.opendata.service.UserPatrolDetailService;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
@@ -57,7 +57,7 @@ import java.util.Map;
  */
 @Slf4j
 @Service
-public class PatrolRoutingWorkServiceImpl extends BaseServiceImpl<PatrolRoutineWorkDao, PatrolRoutineWorkEntity> implements PatrolRoutineWorkService {
+public class BaseGridDailyworkServiceImpl extends BaseServiceImpl<PatrolRoutineWorkDao, BaseGridDailyworkEntity> implements BaseGridDailyworkService {
 
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
@@ -121,7 +121,7 @@ public class PatrolRoutingWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
         return null;
     }
     private Boolean insertRecordBatch(List<PatrolRoutineWorkResult> list, boolean isReload, Map<String, ExDeptDTO> deptMap, Map<String, ExUserDTO> userMap){
-        List<PatrolRoutineWorkEntity> insertList = new ArrayList<>();
+        List<BaseGridDailyworkEntity> insertList = new ArrayList<>();
         list.forEach(o-> insertList.add(buildEntity(o, deptMap, userMap)));
         //insert
         if (CollectionUtils.isEmpty(insertList)){
@@ -132,8 +132,8 @@ public class PatrolRoutingWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
             int i = userPatrolDetailService.deleteByCustomerId(list.get(0).getCustomerId());
             log.info("insertRecordBatch del patrol effectRow:{}",i);
         }
-        LambdaQueryWrapper<PatrolRoutineWorkEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(PatrolRoutineWorkEntity::getCustomerId, list.get(0).getCustomerId());
+        LambdaQueryWrapper<BaseGridDailyworkEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(BaseGridDailyworkEntity::getCustomerId, list.get(0).getCustomerId());
         int delete = baseDao.delete(wrapper);
         log.info("insertRecordBatch del patrol effectRow:{}",delete);
         this.saveOrUpdateBatch(insertList, NumConstant.ONE_HUNDRED);
@@ -157,8 +157,8 @@ public class PatrolRoutingWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
         return detailEntity;
     }
 
-    private PatrolRoutineWorkEntity buildEntity(PatrolRoutineWorkResult record, Map<String, ExDeptDTO> deptMap, Map<String, ExUserDTO> userMap) {
-        PatrolRoutineWorkEntity entity = new PatrolRoutineWorkEntity();
+    private BaseGridDailyworkEntity buildEntity(PatrolRoutineWorkResult record, Map<String, ExDeptDTO> deptMap, Map<String, ExUserDTO> userMap) {
+        BaseGridDailyworkEntity entity = new BaseGridDailyworkEntity();
         entity.setCustomerId(record.getCustomerId());
 
         ExDeptDTO exDeptDTO = deptMap.getOrDefault(record.getGridId(),new ExDeptDTO());

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.epmet.opendata.dao.PatrolRoutineWorkDao">
 
-    <resultMap type="com.epmet.opendata.entity.PatrolRoutineWorkEntity" id="patrolRoutineWorkMap">
+    <resultMap type="com.epmet.opendata.entity.BaseGridDailyworkEntity" id="patrolRoutineWorkMap">
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="gridId" column="GRID_ID"/>

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRoutineWorkResult.java

@@ -31,7 +31,7 @@ public class PatrolRoutineWorkResult implements Serializable {
     private String workTypeFirstCode;
 
     /**
-     * 耳机工作类型 code
+     * 二级工作类型 code
      */
     private String workTypeSecondCode;
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java

@@ -107,8 +107,8 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
             entity.setUserId(loginUserUtil.getLoginUserId());
             entity.setCustomerId(loginUserUtil.getLoginUserCustomerId());
 
-            //entity.setUserId("loginUserUtil.getLoginUserId()");
-            //entity.setCustomerId("loginUserUtil.getLoginUserCustomerId()");
+            entity.setUserId("loginUserUtil.getLoginUserId()");
+            entity.setCustomerId("45687aa479955f9d06204d415238f7cc");
             baseDao.insert(entity);
 
             Result<List<DictTreeResultDTO>> mapResult = adminOpenFeignClient.dictTree(DictTypeEnum.PATROL_WORK_TYPE.getCode());

epmet-user/epmet-user-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml

@@ -22,16 +22,20 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <!--支持多级分类哈-->
     <select id="selectList" resultType="com.epmet.dto.result.PatrolRoutineWorkResult">
         SELECT
-            id, customer_id, grid_id, pids, user_id, title, happen_time, is_normal, work_content,
-            is_key_people_locate, key_people_status, address, longitude, latitude, del_flag,
-            revision, created_by, created_time, updated_by, updated_time
-        FROM epmet_user.patrol_routine_work
-        WHERE  CUSTOMER_ID = #{customerId}
+            m.*,
+            prwt.WORK_TYPE_CODE AS workTypeSecondCode,
+            substring_index(prwt.ALL_P_CODE,':',1) AS workTypeFirstCode
+        FROM epmet_user.patrol_routine_work m
+        LEFT JOIN patrol_routine_work_type prwt ON m.ID = prwt.ROUTINE_WORK_ID
+        WHERE
+        m.CUSTOMER_ID = #{customerId}
         <if test="id != null and id != ''">
             AND ID = #{id}
         </if>
+        AND m.DEL_FLAG = '0'
     </select>