优化巡检代码

java110-bean/src/main/java/com/java110/dto/inspection/InspectionTaskDetailDto.java

@@ -75,6 +75,10 @@ public class InspectionTaskDetailDto extends PageDto implements Serializable {
 
     private String sendFlag;
 
+    private String lng;
+
+    private String lat;
+
     public String getInspectionId() {
         return inspectionId;
     }
@@ -410,4 +414,20 @@ public class InspectionTaskDetailDto extends PageDto implements Serializable {
     public void setQueryTime(String queryTime) {
         this.queryTime = queryTime;
     }
+
+    public String getLng() {
+        return lng;
+    }
+
+    public void setLng(String lng) {
+        this.lng = lng;
+    }
+
+    public String getLat() {
+        return lat;
+    }
+
+    public void setLat(String lat) {
+        this.lat = lat;
+    }
 }

java110-db/src/main/resources/mapper/community/InspectionTaskDetailV1ServiceDaoImplMapper.xml

@@ -8,23 +8,23 @@
     <!-- 保存巡检明细信息 add by wuxw 2018-07-03 -->
     <insert id="saveInspectionTaskDetailInfo" parameterType="Map">
         insert into inspection_task_detail(
-        send_flag,point_end_time,latitude,inspection_time,sort_number,description,act_user_name,task_detail_id,inspection_id,inspection_state,point_start_time,inspection_name,state,community_id,act_user_id,task_id,longitude
+        send_flag,point_end_time,latitude,inspection_time,sort_number,description,act_user_name,task_detail_id,inspection_id,
+        inspection_state,point_start_time,inspection_name,state,community_id,act_user_id,task_id,longitude
         ) values (
-        #{sendFlag},#{pointEndTime},#{latitude},#{inspectionTime},#{sortNumber},#{description},#{actUserName},#{taskDetailId},#{inspectionId},#{inspectionState},#{pointStartTime},#{inspectionName},#{state},#{communityId},#{actUserId},#{taskId},#{longitude}
+        #{sendFlag},#{pointEndTime},#{latitude},#{inspectionTime},#{sortNumber},#{description},#{actUserName},#{taskDetailId},
+        #{inspectionId},#{inspectionState},#{pointStartTime},#{inspectionName},#{state},#{communityId},#{actUserId},#{taskId},#{longitude}
         )
     </insert>
 
 
     <!-- 查询巡检明细信息 add by wuxw 2018-07-03 -->
     <select id="getInspectionTaskDetailInfo" parameterType="Map" resultType="Map">
-        select t.send_flag,t.send_flag sendFlag,t.point_end_time,t.point_end_time
-        pointEndTime,t.latitude,t.inspection_time,t.inspection_time inspectionTime,t.sort_number,t.sort_number
-        sortNumber,t.description,t.status_cd,t.status_cd statusCd,t.act_user_name,t.act_user_name
-        actUserName,t.task_detail_id,t.task_detail_id taskDetailId,t.inspection_id,t.inspection_id
-        inspectionId,t.inspection_state,t.inspection_state inspectionState,t.point_start_time,t.point_start_time
-        pointStartTime,t.inspection_name,t.inspection_name inspectionName,t.state,t.community_id,t.community_id
-        communityId,t.act_user_id,t.act_user_id actUserId,t.task_id,t.task_id taskId,t.longitude
+        select t.send_flag sendFlag,t.point_end_time pointEndTime,t.latitude,t.inspection_time inspectionTime,t.sort_number,t.sort_number
+        sortNumber,t.description,t.status_cd statusCd,t.act_user_name actUserName,t.task_detail_id taskDetailId,t.inspection_id
+        inspectionId,t.inspection_state inspectionState,t.point_start_time pointStartTime,t.inspection_name inspectionName,t.state,
+        t.community_id communityId,t.act_user_id actUserId,t.task_id taskId,t.longitude,ip.lng,ip.lat
         from inspection_task_detail t
+        left join inspection_point ip on t.inspection_id = ip.inspection_id and ip.status_cd = '0'
         where 1 =1
         <if test="sendFlag !=null and sendFlag != ''">
             and t.send_flag= #{sendFlag}
@@ -130,9 +130,7 @@
         <if test="state !=null and state != ''">
             , t.state= #{state}
         </if>
-        <if test="communityId !=null and communityId != ''">
-            , t.community_id= #{communityId}
-        </if>
+
         <if test="actUserId !=null and actUserId != ''">
             , t.act_user_id= #{actUserId}
         </if>
@@ -146,6 +144,9 @@
         <if test="taskDetailId !=null and taskDetailId != ''">
             and t.task_detail_id= #{taskDetailId}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
 
     </update>
 

service-community/src/main/java/com/java110/community/cmd/inspection/QueryInspectionTaskDetailCmd.java

@@ -0,0 +1,59 @@
+package com.java110.community.cmd.inspection;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.inspection.InspectionTaskDetailDto;
+import com.java110.intf.community.IInspectionTaskDetailInnerServiceSMO;
+import com.java110.intf.community.IInspectionTaskDetailV1InnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import com.java110.vo.api.inspectionTaskDetail.ApiInspectionTaskDetailDataVo;
+import com.java110.vo.api.inspectionTaskDetail.ApiInspectionTaskDetailVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 查询巡检明细
+ */
+@Java110Cmd(serviceCode = "inspection.queryInspectionTaskDetail")
+public class QueryInspectionTaskDetailCmd extends Cmd {
+
+    @Autowired
+    private IInspectionTaskDetailV1InnerServiceSMO inspectionTaskDetailV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区ID");
+        Assert.hasKeyAndValue(reqJson, "taskId", "未包含任务ID");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        InspectionTaskDetailDto inspectionTaskDetailDto = BeanConvertUtil.covertBean(reqJson, InspectionTaskDetailDto.class);
+        int count = inspectionTaskDetailV1InnerServiceSMOImpl.queryInspectionTaskDetailsCount(inspectionTaskDetailDto);
+        List<InspectionTaskDetailDto> inspectionTaskDetails = null;
+        if (count > 0) {
+            inspectionTaskDetails = BeanConvertUtil.covertBeanList(
+                    inspectionTaskDetailV1InnerServiceSMOImpl.queryInspectionTaskDetails(inspectionTaskDetailDto),
+                    InspectionTaskDetailDto.class);
+        } else {
+            inspectionTaskDetails = new ArrayList<>();
+        }
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, inspectionTaskDetails);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        context.setResponseEntity(responseEntity);
+    }
+}

service-community/src/main/java/com/java110/community/cmd/inspectionTaskDetail/ListInspectionTaskDetailsCmd.java

@@ -12,6 +12,7 @@ import com.java110.intf.community.IInspectionTaskDetailInnerServiceSMO;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.api.inspectionTaskDetail.ApiInspectionTaskDetailDataVo;
 import com.java110.vo.api.inspectionTaskDetail.ApiInspectionTaskDetailVo;
@@ -35,6 +36,8 @@ public class ListInspectionTaskDetailsCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
+
     }
 
     @Override

service-community/src/main/java/com/java110/community/dao/impl/InspectionTaskDetailV1ServiceDaoImpl.java

@@ -71,9 +71,9 @@ public class InspectionTaskDetailV1ServiceDaoImpl extends BaseServiceDao impleme
     public List<Map> getInspectionTaskDetailInfo(Map info) throws DAOException {
         logger.debug("查询 getInspectionTaskDetailInfo 入参 info : {}",info);
 
-        List<Map> businessInspectionTaskDetailInfos = sqlSessionTemplate.selectList("inspectionTaskDetailV1ServiceDaoImpl.getInspectionTaskDetailInfo",info);
+        List<Map> infos = sqlSessionTemplate.selectList("inspectionTaskDetailV1ServiceDaoImpl.getInspectionTaskDetailInfo",info);
 
-        return businessInspectionTaskDetailInfos;
+        return infos;
     }
 
 
@@ -100,12 +100,12 @@ public class InspectionTaskDetailV1ServiceDaoImpl extends BaseServiceDao impleme
     public int queryInspectionTaskDetailsCount(Map info) {
         logger.debug("查询 queryInspectionTaskDetailsCount 入参 info : {}",info);
 
-        List<Map> businessInspectionTaskDetailInfos = sqlSessionTemplate.selectList("inspectionTaskDetailV1ServiceDaoImpl.queryInspectionTaskDetailsCount", info);
-        if (businessInspectionTaskDetailInfos.size() < 1) {
+        List<Map> infos = sqlSessionTemplate.selectList("inspectionTaskDetailV1ServiceDaoImpl.queryInspectionTaskDetailsCount", info);
+        if (infos.size() < 1) {
             return 0;
         }
 
-        return Integer.parseInt(businessInspectionTaskDetailInfos.get(0).get("count").toString());
+        return Integer.parseInt(infos.get(0).get("count").toString());
     }