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

gateway/pom.xml

@@ -93,7 +93,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-
+                <version>3.8.1</version>
                 <configuration>
                     <source>8</source>
                     <target>8</target>

operation_manager/src/main/java/com/huaxu/common/ConvertXY.java

@@ -118,7 +118,7 @@ public class ConvertXY {
 	 */
 	public static MyPoint ConvertXian80ToXY(String x, String y,String moveXY) {
 		MyPoint pPoint = new MyPoint();
-		double dx = Double.parseDouble(x), dy = Double.parseDouble(y);
+		double dx = Double.parseDouble(x)+196600, dy = Double.parseDouble(y)-270;
 		int moveX=0,moveY=0;
 		if(!StringUtils.isEmpty(moveXY)){
 			moveX=Integer.parseInt(moveXY.split(",")[0]);
@@ -133,8 +133,6 @@ public class ConvertXY {
 		double X84 = Double.parseDouble(String.format("%.6f", Double.parseDouble(dblLon.toString())));
 		double Y84 = Double.parseDouble(String.format("%.6f", Double.parseDouble(dblLat.toString())));
 
-		X84 +=  2.001201;
-		Y84 +=  0.000155;
 		pPoint.X =X84;
 		pPoint.Y =Y84;
 		return pPoint;

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -1,5 +1,6 @@
 package com.huaxu.order.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huaxu.client.UserCenterClient;
@@ -40,7 +41,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-import java.lang.reflect.Array;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -393,6 +395,21 @@ public class WorkOrderManageController {
         //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
         workOrderManageDto.setPermissonType(loginUser.getPermissonType());
         List<WorkOrderManageDto> list = workOrderManageService.selectMaintainOrder(workOrderManageDto);
+        for(WorkOrderManageDto dto : list){
+            if(dto.getFlowDetail() != null){
+              JSONObject jsonDetail = (JSONObject) JSONObject.parse(dto.getFlowDetail());
+              if(jsonDetail.containsKey("预计完成时间")){
+                  SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                  Date planFinishDate = null;
+                  try {
+                      planFinishDate = dateFormat.parse(jsonDetail.getString("预计完成时间"));
+                  } catch (ParseException e) {
+                      e.printStackTrace();
+                  }
+                  dto.setPlanFinishDate(planFinishDate);
+              }
+            }
+        }
         setName(list);
         return new AjaxMessage<>(ResultStatus.OK, list);
     }

operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml

@@ -792,11 +792,11 @@
   </select>
   <!--维修列表-工单情况（未派单，处理中）-->
   <select id="selectMaintainOrder" resultMap="BaseResultMap" >
-    select t1.task_no,  t1.address, t1.task_desc, t1.plan_finish_date, t1.date_create, t1.order_user_id,
+    select t1.id ,t1.task_no,  t1.address, t1.task_desc, t1.plan_finish_date, t1.date_create, t1.order_user_id, t2.flow_detail,
     case when t1.order_status=0 then '未派单' when t1.order_status =1 or t1.order_status=4 then '处理中' end order_status_name,
     case when t1.event_type=1 then '运维上报' when t1.event_type=2 then '用户上报' when t1.event_type=3 then '设备告警' end  event_type_name,
     geo
-    from sc_work_order_manage t1
+    from sc_work_order_manage t1 left join sc_work_flow_detail t2 on t1.id=t2.flow_id and t2.flow_type=2
     <where>
       t1.order_status !=2 and t1.order_status !=3
       <if test="order.tenantId != null and order.tenantId != ''">

sms_water/src/main/java/com/huaxu/controller/AppReportMonitorController.java

@@ -39,7 +39,7 @@ public class AppReportMonitorController {
     @RequestMapping(value = "getSceneByCompany",method = RequestMethod.GET)
     @ApiOperation(value = "App报表展示——公司场景查询（点击公司查询水厂）")
     public AjaxMessage<List<SceneEntity>> getSceneByCompany(
-            @ApiParam(value = "场景类型名称：水源、水厂、泵站") @RequestParam String sceneTypeName,
+            @ApiParam(value = "场景类型名称：水源、水厂、泵站") @RequestParam(required = false)  String sceneTypeName,
             @ApiParam(value = "公司id") @RequestParam Integer companyOrgId){
         return new AjaxMessage<>(ResultStatus.OK,appReportMonitorService.getSceneByCompany(sceneTypeName,companyOrgId));
     }
@@ -49,7 +49,7 @@ public class AppReportMonitorController {
     @RequestMapping(value = "getSceneCompanyBySearch",method = RequestMethod.GET)
     @ApiOperation(value = "App报表展示——公司场景查询（条件查询）")
     public AjaxMessage<CompanySceneInfoDto> getSceneCompanyBySearch(
-            @ApiParam(value = "场景类型名称：水源、水厂、泵站") @RequestParam String sceneTypeName,
+            @ApiParam(value = "场景类型名称：水源、水厂、泵站") @RequestParam(required = false)  String sceneTypeName,
             @ApiParam(value = "查询条件") @RequestParam(required = false) String condition){
         return new AjaxMessage<>(ResultStatus.OK,appReportMonitorService.getSceneByCompanyBySearch(sceneTypeName,condition));
     }

sms_water/src/main/java/com/huaxu/service/impl/OnlineMonitorImpl.java

@@ -125,7 +125,7 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
 
         for(MonitorDataCollectDto mon:result){
             BigDecimal yieldWaterUsage=monitorDataReportServiceImpl.getAmountCount(null,mon.getSceneId().intValue(),"泵站",3,2);
-            mon.setYieldWaterUsage(yieldWaterUsage.doubleValue()/10000);
+            mon.setYieldWaterUsage(yieldWaterUsage.doubleValue());
         }
         //按水量倒序排序 如果是水源按照取水量排序，其他按照供水量
         result.sort(new Comparator<MonitorDataCollectDto>() {
@@ -508,7 +508,7 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
                     secDataCollectDto.setCount(1);
                     secDataCollectDto.setComName(orgInfoUtil.getOrgName(item.getCompanyOrgId().intValue()));
                     BigDecimal yieldWaterUsage=monitorDataReportServiceImpl.getAmountCount(item.getCompanyOrgId().intValue(),null,"泵站",3,2);
-                    secDataCollectDto.setYieldWaterUsage(yieldWaterUsage.doubleValue()/10000);
+                    secDataCollectDto.setYieldWaterUsage(yieldWaterUsage.doubleValue());
                     map.put(item.getCompanyOrgId(), secDataCollectDto);
                 } else {
                     Integer count = map.get(item.getCompanyOrgId()).getCount() != null ? map.get(item.getCompanyOrgId()).getCount() : 1;

sms_water/src/main/resources/mapper/AppReportMonitorMapper.xml

@@ -10,7 +10,9 @@
         from sms_scene_type st
         left join sms_scene s on st.id=s.SCENE_TYPE_ID
         where st.STATUS = 1 and s.STATUS = 1
-        and st.SCENE_TYPE_NAME =#{sceneType}
+        <if test="sceneType != null and sceneType !=''">
+          and st.SCENE_TYPE_NAME =#{sceneType}
+        </if>
         and  s.COMPANY_ORG_ID = #{companyOrgId}
         and s.TENANT_ID = #{tenantId}
         <if test="userType!=null and userType!=-999 and userType!=-9999 and  programItems != null and programItems.size() > 0">
@@ -93,7 +95,9 @@
         from sms_scene_type st
         left join sms_scene s on st.id=s.SCENE_TYPE_ID
         where st.STATUS = 1 and s.STATUS = 1
-        and st.SCENE_TYPE_NAME =#{sceneType}
+        <if test="sceneType != null and sceneType !=''">
+          and st.SCENE_TYPE_NAME =#{sceneType}
+        </if>
         <if test="condition != null and condition !=''">
             and s.SCENE_NAME like concat('%',#{condition},'%')
         </if>