Merge remote-tracking branch 'origin/20210716' into 20210716

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/install/InstallDetailDto.java

@@ -1,5 +1,6 @@
 package com.zcxk.rmcp.api.dto.install;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -23,6 +24,7 @@ public class InstallDetailDto {
     @ApiModelProperty(value="安装数")
     private Integer installNum;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value="创建时间")
     private LocalDateTime createDate;
 

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/install/InstallDeviceDto.java

@@ -57,4 +57,7 @@ public class InstallDeviceDto {
 
     @ApiModelProperty(value="厂商名称")
     private String manufacturerName;
+
+    @ApiModelProperty(value="是否支持阀门 0：否 1：是")
+    private Integer isSupportValve;
 }

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/install/InstallPlanDataDto.java

@@ -9,7 +9,6 @@ import java.util.List;
 @Data
 public class InstallPlanDataDto {
 
-    @JsonIgnore
     @ApiModelProperty(value="id",hidden = true)
     private Long id;
 

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/enums/RmcpErrorEnum.java

@@ -40,6 +40,12 @@ public enum RmcpErrorEnum implements RespCode {
      */
     RMCP_UPDATE_FAIL(201006,"更新失败！"),
 
+
+    /**
+     * 该单元户已安装水表
+     */
+    DOOR_EXISTED(201007,"该单元户已安装水表"),
+
     /**
      * 未找到相关数据
      */

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/DeviceMapper.java

@@ -144,7 +144,7 @@ public interface DeviceMapper {
      * @return java.util.List<com.zcxk.rmcp.api.dto.install.InstallDeviceDto>
      * @author linqingwei
      **/
-    List<InstallDeviceDto> getUnInstallDeviceList(@Param("tenantId") String tenantId, @Param("companyOrgId") Integer companyOrgId, @Param("deptOrgId") Integer deptOrgId, @Param("productId") Integer productId, @Param("listId") Integer listId);
+    List<InstallDeviceDto> getUnInstallDeviceList(@Param("tenantId") String tenantId, @Param("companyOrgId") Integer companyOrgId, @Param("deptOrgId") Integer deptOrgId, @Param("productId") Integer productId, @Param("communityId") Integer communityId, @Param("listId") Integer listId);
 
     /*
      * @description deviceNo获取设备
@@ -192,11 +192,12 @@ public interface DeviceMapper {
     List<MeterSyncDto> meterSync(@Param("meterSync") MeterSyncInputDto meterSync);
 
     /**
-    * 统计小区下有多少个设备数
-    * @author Andy
-    * @date 16:04 2021/9/10
-    * @param communityId:
-    * @return int
-    **/
+     * 统计小区下有多少个设备数
+     *
+     * @param communityId:
+     * @return int
+     * @author Andy
+     * @date 16:04 2021/9/10
+     **/
     int countDeviceByCommunityId(int communityId);
 }

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/InstallListMapper.java

@@ -27,7 +27,7 @@ public interface InstallListMapper {
 
     List<InstallDeviceDto> getInstallList(@Param("dto") InstallQueryDto dto, @Param("userCondition") UserCondition userCondition);
 
-    List<InstallListVo> getUnInstallList(@Param("planId") Integer planId);
+    List<InstallListVo> findInstallList(@Param("planId") Integer planId);
 
     List<InstallDeviceDto> getUnInstallDeviceList(@Param("planId") Integer planId);
 

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/DeviceMapper.xml

@@ -674,6 +674,7 @@
       <if test="companyOrgId != null">and rd.company_org_id = #{companyOrgId}</if>
       <if test="deptOrgId != null">and rd.dept_org_id = #{deptOrgId}</if>
       <if test="productId != null">and rd.product_id = #{productId}</if>
+      <if test="communityId != null != null">and rd.community_id = #{communityId}</if>
     </where>
   </select>
 

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/InstallListMapper.xml

@@ -275,9 +275,11 @@
     rd.last_receive_time,
     rd.user_name,
     rd.user_phone,
-    rd.is_accept
+    rd.is_accept,
+    rp.is_support_valve
     from rmcp_install_list ril
     left join rmcp_device rd on ril.device_id = rd.id
+    left join rmcp_product rp on rd.product_id = rp.id
     where ril.status = 1 and rd.status = 1 and ril.install_plan_id = #{dto.id}
     <if test="userCondition.tenantId != null">and ril.tenant_id = #{userCondition.tenantId}</if>
     <if test="dto.deviceNo != null and dto.deviceNo != ''">and (rd.meter_no LIKE concat('%',#{dto.deviceNo},'%') or rd.file_no LIKE concat('%',#{dto.deviceNo},'%'))</if>
@@ -287,8 +289,8 @@
     order by ril.create_date desc
   </select>
 
-  <select id="getUnInstallList" resultType="com.zcxk.rmcp.api.vo.InstallListVo">
-    select id,door_no,meter_code,user_name,user_phone,id_card from rmcp_install_list where status = 1 and install_plan_id = #{planId} and is_installed = 0
+  <select id="findInstallList" resultType="com.zcxk.rmcp.api.vo.InstallListVo">
+    select id,door_no,meter_code,user_name,user_phone,id_card from rmcp_install_list where status = 1 and install_plan_id = #{planId}
   </select>
 
   <select id="getUnInstallDeviceList" resultType="com.zcxk.rmcp.api.dto.install.InstallDeviceDto">

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/InstallPlanMapper.xml

@@ -300,12 +300,13 @@
     left join rmcp_area a2 on a2.id = rc.city
     left join rmcp_area a3 on a3.id = rc.region
     where rip.status = 1
-    <if test="condition.name != null and condition.name != ''">and 1 = 1</if>
+    <if test="condition.name != null and condition.name != ''">and rip.plan_name LIKE concat('%',#{condition.name},'%')</if>
     <if test="condition.companyOrgId != null">and rip.company_org_id = #{condition.companyOrgId}</if>
     <if test="condition.deptOrgId != null">and rip.dept_org_id = #{condition.deptOrgId}</if>
     <if test="condition.acceptStatus != null">and rip.accept_status = #{condition.acceptStatus}</if>
     <if test="condition.planStatus != null">and rip.plan_status = #{condition.planStatus}</if>
     <include refid="permissionCondition"/>
+    order by rip.create_date desc
   </select>
 
   <sql id="permissionCondition">

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/InstallController.java

@@ -89,7 +89,7 @@ public class InstallController {
     @PostMapping("allAccept")
     @ApiOperation(value = "全部验收")
     public AjaxMessage<Void> allAccept(
-            @Valid InstallQueryDto dto
+            @Valid @RequestBody(required = true) InstallQueryDto dto
     ){
         installListService.allAccept(dto);
         return AjaxMessage.success();
@@ -107,7 +107,7 @@ public class InstallController {
     @PostMapping("allDelete")
     @ApiOperation(value = "全部删除")
     public AjaxMessage<Void> allDelete(
-            @Valid InstallQueryDto dto
+            @Valid @RequestBody(required = true) InstallQueryDto dto
     ){
         installListService.allDelete(dto);
         return AjaxMessage.success();

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/InstallPlanController.java

@@ -125,7 +125,7 @@ public class InstallPlanController {
     @ApiOperation(value = "下载计划模板", notes = "下载计划模板")
     @LogAnnotation(module = "【安装计划】下载模板")
     public void planDownTemplate(
-            @ApiParam(value = "access_token", required = true) @RequestParam(required = true) String accessToken,
+            @ApiParam(value = "access_token", required = true) @RequestParam(required = true) String access_token,
             HttpServletRequest request, HttpServletResponse response
     ) {
         installPlanService.downPlanTemplate(response);

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/excel/resolver/listener/InstallPlanListener.java

@@ -59,8 +59,6 @@ public class InstallPlanListener extends AnalysisEventListener<InstallPlanExcelD
     public void doAfterAllAnalysed(AnalysisContext analysisContext) {
         log.info("批量导出设备完成 successNum = {},failNum = {}",excelData.getSuccessNum().get(),excelData.getFailNum().get());
         installPlanService.saveExcelData(excelData);
-        // TODO: 2021/8/2 生成失败文件
-        // TODO: 2021/8/2 生成消息
     }
 
     @Override

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/install/impl/InstallListServiceImpl.java

@@ -133,6 +133,7 @@ public class InstallListServiceImpl implements InstallListService {
             device.setOldEndDegree(dto.getOldEndDegree());
             device.setOldImageUrl(dto.getOldImageUrl());
             device.setInstallDate(LocalDateTime.now());
+            device.setAddress(install.getDoorNo());
             device.setIsInstall(1);
             device.setDeviceStatus(DeviceStatusEnum.UNUSED.getCode());
             device.setValveStatus(ValveStatusEnum.ON.getCode());
@@ -228,7 +229,7 @@ public class InstallListServiceImpl implements InstallListService {
     public List<InstallDeviceDto> getUnInstallList(Integer planId, Integer id) {
         LoginUser loginUser = UserUtil.getCurrentUser();
         InstallPlan plan = installPlanMapper.findById(planId);
-        List<InstallDeviceDto> list = deviceMapper.getUnInstallDeviceList(loginUser.getTenantId(),plan.getCompanyOrgId(),plan.getDeptOrgId(),plan.getProductId(),id);
+        List<InstallDeviceDto> list = deviceMapper.getUnInstallDeviceList(loginUser.getTenantId(),plan.getCompanyOrgId(),plan.getDeptOrgId(),plan.getProductId(),plan.getCommunityId(),id);
         return list;
     }
 
@@ -249,6 +250,11 @@ public class InstallListServiceImpl implements InstallListService {
         }
 
         InstallList install = installListMapper.findById(data.getId());
+        excelData.setPlanId(install.getInstallPlanId());
+        if (install.getIsInstalled() == 1) {
+            resultMessage.setMessage(RmcpErrorEnum.DOOR_EXISTED.getMessage());
+            return resultMessage;
+        }
         InstallPlan installPlan = installPlanMapper.findById(install.getInstallPlanId());
         Product product = productMapper.findById(installPlan.getProductId());
         Device device = new Device();
@@ -267,6 +273,7 @@ public class InstallListServiceImpl implements InstallListService {
         device.setUserPhone(data.getPhone());
         device.setIdCard(data.getIdCard());
         device.setInstallDate(LocalDateTime.now());
+        device.setAddress(install.getDoorNo());
         device.setIsInstall(1);
         device.setDeviceStatus(DeviceStatusEnum.UNUSED.getCode());
         device.setValveStatus(ValveStatusEnum.ON.getCode());
@@ -280,7 +287,7 @@ public class InstallListServiceImpl implements InstallListService {
         installList.setDeviceId(device.getId());
         this.updateByPrimaryKeySelective(installList);
 
-        excelData.setPlanId(install.getInstallPlanId());
+
 
         resultMessage.setStatus(true);
         return resultMessage;

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/install/impl/InstallPlanServiceImpl.java

@@ -320,12 +320,12 @@ public class InstallPlanServiceImpl implements InstallPlanService {
     public void downInstallMeterTemplate(Integer id, HttpServletResponse response) {
 
         InstallPlan plan = installPlanMapper.findById(id);
-        List<InstallListVo> list = installListMapper.getUnInstallList(id);
-
+        List<InstallListVo> list = installListMapper.findInstallList(id);
+        Community community = communityMapper.findCommunity(plan.getCommunityId());
         DownloadExcelData data = new DownloadExcelData();
         data.setId(id);
         data.setResponse(response);
-        data.setDownloadName(plan.getPlanName()+"批量导入模板");
+        data.setDownloadName(community.getName()+"批量导入模板");
         data.setFilePath(commonService.getExcelFilePath("template"));
         data.setInstallMeterDataList(convertInstallMeterData(list));
 
@@ -367,7 +367,7 @@ public class InstallPlanServiceImpl implements InstallPlanService {
 
         InstallPlan installPlan = new InstallPlan();
         installPlan.setTenantId(excelData.getImportFile().getTenantId());
-        installPlan.setPlanName(infoData.getCommunityName());
+        //installPlan.setPlanName(infoData.getCommunityName());
         if(community!=null)installPlan.setCommunityId(community.getId());
         installPlan.setCompanyOrgId(companyOrg.getId());
         if(deptOrg!=null)installPlan.setDeptOrgId(deptOrg.getId());
@@ -479,6 +479,7 @@ public class InstallPlanServiceImpl implements InstallPlanService {
         InstallPlan updateInstallPlan = new InstallPlan();
         updateInstallPlan.setId(excelData.getInstallPlan().getId());
         updateInstallPlan.setEnableUnit(excelData.getEnableUnit());
+        updateInstallPlan.setDoorNum(excelData.getInstallList().size());
         this.updateByPrimaryKeySelective(updateInstallPlan);
     }