Merge remote-tracking branch 'origin/master'

operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -1,16 +1,24 @@
 package com.huaxu.task.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huaxu.model.AjaxMessage;
+import com.huaxu.model.LoginUser;
+import com.huaxu.model.Pagination;
 import com.huaxu.model.ResultStatus;
 import com.huaxu.task.entity.PlanManage;
 import com.huaxu.task.service.PlanManageService;
 import com.huaxu.util.DatesUtil;
+import com.huaxu.util.UserUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/workflow/task/")
@@ -20,7 +28,6 @@ public class PlanManageController {
     @Autowired
     PlanManageService planManageService;
 
-
     /**
      * 新增巡检计划
      * @param planName 任务名称
@@ -28,44 +35,82 @@ public class PlanManageController {
      * @param planStartDate 计划开始时间
      * @param planEndDate 计划结束时间
      * @param userId 计划巡检人ID
-     * @param planUserId 计划安排人ID
      * @param taskContent 任务内容
      * @param taskAreaShape 任务区域坐标
      * @param taskAreaName 任务区域名称
-     * @param createBy 创建者
      * @return
      */
     @PostMapping("/plan/add")
     @ApiOperation(value = "新增巡检计划")
     public AjaxMessage addPlan(@ApiParam(value = "任务名称", required = true) @RequestParam(required = true) String planName,
                                @ApiParam(value = "任务类型", required = true) @RequestParam(required = true) Integer taskType,
-                               @ApiParam(value = "计划开始时间", required = true) @RequestParam(required = true) Date planStartDate,
-                               @ApiParam(value = "计划结束时间", required = true) @RequestParam(required = true) Date planEndDate,
+                               @ApiParam(value = "计划开始时间", required = true) @RequestParam(required = true) String planStartDate,
+                               @ApiParam(value = "计划结束时间", required = true) @RequestParam(required = true) String planEndDate,
                                @ApiParam(value = "计划巡检人ID", required = true) @RequestParam(required = true) String userId,
-                               @ApiParam(value = "计划安排人ID", required = true) @RequestParam(required = true) String planUserId,
                                @ApiParam(value = "任务内容", required = true) @RequestParam(required = true) String taskContent,
                                @ApiParam(value = "任务区域坐标", required = true) @RequestParam(required = true) String taskAreaShape,
-                               @ApiParam(value = "任务区域名称", required = true) @RequestParam(required = true) String taskAreaName,
-                               @ApiParam(value = "创建者ID", required = true) @RequestParam(required = true) String createBy) {
+                               @ApiParam(value = "任务区域名称", required = true) @RequestParam(required = true) String taskAreaName) {
+        LoginUser loginUser = UserUtil.getCurrentUser();
         String planId=DatesUtil.formatDate(new Date(),"yyyyMMddHHmmss")+String.valueOf((int) (Math.random()*(9999-1000)+1000));
         PlanManage record = new PlanManage();
         record.setUserId(userId);
         record.setPlanId(planId);
         record.setPlanName(planName);
         record.setTaskType(taskType);
-        record.setPlanStartDate(planStartDate);
-        record.setPlanEndDate(planEndDate);
+        record.setPlanStartDate(DatesUtil.parseDate(planStartDate,"yyyy-MM-dd HH:mm:ss"));
+        record.setPlanEndDate(DatesUtil.parseDate(planEndDate,"yyyy-MM-dd HH:mm:ss"));
         record.setUserId(userId);
-        record.setPlanUserId(planUserId);
+        record.setPlanUserId(loginUser.getId().toString());
         record.setTaskContent(taskContent);
         record.setTaskAreaShape(taskAreaShape);
         record.setTaskAreaName(taskAreaName);
-        record.setCreateBy(createBy);
-        record.setDateCreate(new Date(System.currentTimeMillis()));
+        record.setCreateBy(loginUser.getId().toString());
+        record.setTenantId(loginUser.getTenantId());
+        record.setDateCreate(DatesUtil.parseDate(DatesUtil.formatNow(),"yyyy-MM-dd HH:mm:ss"));
         int rows = planManageService.insertSelective(record);
         if(rows > 0) {
             return new AjaxMessage(ResultStatus.OK);
         }
         return new AjaxMessage(ResultStatus.ERROR);
     }
-}
+
+    @GetMapping("/plan/select")
+    @ApiOperation(value = "查询巡检计划")
+    public AjaxMessage<List<PlanManage>> selectPlan(
+            @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
+            @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
+            @ApiParam(value = "计划单号或计划名称", required = true) @RequestParam(required = false) String key,
+            @ApiParam(value = "计划安排起始日期", required = true) @RequestParam(required = false) String startDate,
+            @ApiParam(value = "计划安排截至日期", required = true) @RequestParam(required = false) String endDate){
+
+        //根据用户编号，获取用户的权限
+        LoginUser loginUser = UserUtil.getCurrentUser();
+        Map<String,Object> map =new HashMap<String,Object>();
+        map.put("tenantId",loginUser.getTenantId());
+        map.put("key",key);
+        map.put("startDate",startDate);
+        map.put("endDate",endDate);
+        map.put("permissonType",loginUser.getPermissonType());
+
+        IPage<List<PlanManage>> iPage = new Page<>(pageNum, pageSize);
+
+
+//        iPage = planManageService.selectPlanByIdAndDate(iPage, alarmSettingDto);
+//        Pagination<AlarmSettingDto> pages = new Pagination<>(iPage);
+//        for(AlarmSettingDto alarm : pages.getList()){
+//            alarm.setCompanyOrgName(orgInfoUtil.getOrgName(alarm.getCompanyOrgId()));
+//            alarm.setDeptOrgName(orgInfoUtil.getOrgName(alarm.getDeptOrgId()));
+//        }
+//        return new AjaxMessage<>(ResultStatus.OK, pages);
+
+        List<PlanManage> list = planManageService.selectPlanByIdAndDate(map);
+
+
+
+        return new AjaxMessage<List<PlanManage>>(ResultStatus.OK,list);
+    }
+
+
+
+
+}

operation_manager/src/main/java/com/huaxu/task/dao/PlanManageMapper.java

@@ -3,6 +3,9 @@ package com.huaxu.task.dao;
 import com.huaxu.task.entity.PlanManage;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 @Mapper
 public interface PlanManageMapper {
 
@@ -13,4 +16,6 @@ public interface PlanManageMapper {
     PlanManage selectByPrimaryKey(Integer id);
 
     int updateByPrimaryKeySelective(PlanManage record);
+
+    List<PlanManage> selectPlanByIdAndDate(Map<String,Object> map);
 }

operation_manager/src/main/java/com/huaxu/task/service/PlanManageService.java

@@ -2,6 +2,9 @@ package com.huaxu.task.service;
 
 import com.huaxu.task.entity.PlanManage;
 
+import java.util.List;
+import java.util.Map;
+
 public interface PlanManageService {
     /**
      * 新增任务单
@@ -12,4 +15,11 @@ public interface PlanManageService {
      * 更新任务单
      */
     int updateByPrimaryKeySelective(PlanManage record);
+
+    /**
+     * 按计划单号或计划名称及时间查询巡检计划
+     * @param map
+     * @return
+     */
+    List<PlanManage> selectPlanByIdAndDate(Map<String,Object> map);
 }

operation_manager/src/main/java/com/huaxu/task/service/impl/PlanManageServiceImpl.java

@@ -6,6 +6,9 @@ import com.huaxu.task.service.PlanManageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 @Service
 public class PlanManageServiceImpl implements PlanManageService {
 
@@ -22,5 +25,10 @@ public class PlanManageServiceImpl implements PlanManageService {
         return planManageMapper.updateByPrimaryKeySelective(record);
     }
 
+    @Override
+    public List<PlanManage> selectPlanByIdAndDate(Map<String, Object> map) {
+        return planManageMapper.selectPlanByIdAndDate(map);
+    }
+
 
 }

operation_manager/src/main/resources/mapper/task/PlanManageMapper.xml

@@ -26,26 +26,28 @@
     <result column="update_by" property="updateBy" jdbcType="VARCHAR" />
     <result column="date_update" property="dateUpdate" jdbcType="TIMESTAMP" />
 
-  <!--  <association property="planUser" javaType="com.huaxu.entity.UserEntity">
-      <id column="plan_user_id" property="id" jdbcType="INTEGER"/>
-      <result column="plan_user_name" property="username"/>
-    </association>
+<!--   <association property="planUser" javaType="com.huaxu.entity.UserEntity">-->
+<!--      <id column="plan_user_id" property="id" jdbcType="INTEGER"/>-->
+<!--      <result column="plan_user_name" property="username"/>-->
+<!--    </association>-->
+
+<!--    <association property="user" javaType="com.huaxu.entity.UserEntity">-->
+<!--      <id column="user_id" property="id" jdbcType="INTEGER"/>-->
+<!--      <result column="user_name" property="username"/>-->
+<!--    </association>-->
+
+<!--    <association property="createBy" javaType="com.huaxu.entity.UserEntity">-->
+<!--      <id column="create_by_id" property="id" jdbcType="INTEGER"/>-->
+<!--      <result column="create_by_name" property="username"/>-->
+<!--    </association>-->
+
+<!--    <association property="updateBy" javaType="com.huaxu.entity.UserEntity">-->
+<!--      <id column="update_by_id" property="id" jdbcType="INTEGER"/>-->
+<!--      <result column="update_by_name" property="username"/>-->
+<!--    </association>-->
 
-    <association property="user" javaType="com.huaxu.entity.UserEntity">
-      <id column="user_id" property="id" jdbcType="INTEGER"/>
-      <result column="user_name" property="username"/>
-    </association>
 
-    <association property="createBy" javaType="com.huaxu.entity.UserEntity">
-      <id column="create_by_id" property="id" jdbcType="INTEGER"/>
-      <result column="create_by_name" property="username"/>
-    </association>
 
-    <association property="updateBy" javaType="com.huaxu.entity.UserEntity">
-      <id column="update_by_id" property="id" jdbcType="INTEGER"/>
-      <result column="update_by_name" property="username"/>
-    </association>
--->
   </resultMap>
   <sql id="Base_Column_List" >
     id, plan_id, plan_name, plan_user_id, user_id, plan_date, plan_start_date, plan_end_date, 
@@ -60,6 +62,7 @@
     from sc_plan_manage
     where id = #{id,jdbcType=INTEGER}
   </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from sc_plan_manage
     where id = #{id,jdbcType=INTEGER}
@@ -210,6 +213,7 @@
       </if>
     </trim>
   </insert>
+
   <update id="updateByPrimaryKeySelective" parameterType="com.huaxu.task.entity.PlanManage" >
     update sc_plan_manage
     <set >
@@ -283,10 +287,20 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
 
-  <select id="selectPlanTagId" resultType="java.lang.String" parameterType="java.lang.String" >
-    select plan_id
+  <select id="selectPlanByIdAndDate" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List"/>
     from sc_plan_manage
-    where plan_id like "%" || #{planId,jdbcType=VARCHAR} || "%" and rownum=1
-    order by plan_id desc
+    where
+    tenant_id = #{tenantId, jdbcType = VARCHAR}
+    and plan_user_id in
+    <foreach collection="userIdList" item="item" index="index" open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}
+    </foreach>
+    <if test="key != null and key != ''">
+       and plan_id like "%" || #{planId,jdbcType=VARCHAR} || "%" or plan_name like "%" || #{planName,jdbcType=VARCHAR} || "%"
+    </if>
+    order by date_create desc
   </select>
+
 </mapper>

sms_water/src/main/java/com/huaxu/dto/generalView/SceneNormalRate.java

@@ -29,4 +29,17 @@ public class SceneNormalRate implements Serializable {
     @ApiModelProperty("名称")
     private String typeName;
 
+    public SceneNormalRate(){
+        this.abnormal = 0;
+        this.normal = 0;
+        this.normalRate = BigDecimal.ZERO;
+    }
+
+    public SceneNormalRate(String typeName){
+        this.abnormal = 0;
+        this.normal = 0;
+        this.normalRate = BigDecimal.ZERO;
+        this.typeName = typeName;
+    }
+
 }

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

@@ -715,17 +715,30 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
         List<SceneNormalRate> SceneNormalRates = new ArrayList<>();
         //水质
         SceneNormalRate sceneNormalRate1 = monitorDataReportMapper.getQualificationForScene(tenantId, -1,loginUser.getType(),loginUser.getPermissonType(),loginUser.getProgramItemList());
-        sceneNormalRate1.setTypeName("水质");
         //PH
         SceneNormalRate sceneNormalRate2 = monitorDataReportMapper.getQualificationForScene(tenantId, 8,loginUser.getType(),loginUser.getPermissonType(),loginUser.getProgramItemList());
-        sceneNormalRate2.setTypeName("PH");
         //浊度
         SceneNormalRate sceneNormalRate3 = monitorDataReportMapper.getQualificationForScene(tenantId, 10,loginUser.getType(),loginUser.getPermissonType(),loginUser.getProgramItemList());
-        sceneNormalRate3.setTypeName("浊度");
         //余氯
         SceneNormalRate sceneNormalRate4 = monitorDataReportMapper.getQualificationForScene(tenantId, 11,loginUser.getType(),loginUser.getPermissonType(),loginUser.getProgramItemList());
-        sceneNormalRate4.setTypeName("余氯");
 
+        if(sceneNormalRate1 == null){
+            sceneNormalRate1 =new SceneNormalRate();
+        }
+        if(sceneNormalRate2 == null){
+            sceneNormalRate2 =new SceneNormalRate();
+        }
+        if(sceneNormalRate3 == null){
+            sceneNormalRate3 =new SceneNormalRate();
+        }
+        if(sceneNormalRate4 == null){
+            sceneNormalRate4 =new SceneNormalRate();
+        }
+
+        sceneNormalRate1.setTypeName("水质");
+        sceneNormalRate2.setTypeName("PH");
+        sceneNormalRate3.setTypeName("浊度");
+        sceneNormalRate4.setTypeName("余氯");
         SceneNormalRates.add(sceneNormalRate1);
         SceneNormalRates.add(sceneNormalRate2);
         SceneNormalRates.add(sceneNormalRate3);

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

@@ -1076,7 +1076,6 @@
             </if>
         </if>
 
-        group by dp.DEVICE_ID ,dp.ATTRIBUTE_ID,dp.PARM_TYPE
     </select>
     <select id="getDeviceWaterDetailForYear" resultType="java.math.BigDecimal">
         select
@@ -1115,7 +1114,6 @@
             </if>
         </if>
 
-        group by dp.DEVICE_ID ,dp.ATTRIBUTE_ID,dp.PARM_TYPE
 
     </select>