Merge branch 'develop_dl' of http://36.40.66.175:5000//moa/amos-boot-biz into develop_dl

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -189,7 +189,6 @@
                 AND g.peopleType = #{map.peopleType}
             </if>
             <if test="map.fireManagementPost != null">
---                 AND locate(#{map.fireManagementPost}, g.fireManagementPost)
                 AND g.fireManagementPost IN
                 <foreach item="item" index="index"  collection="map.fireManagementPost" open="(" separator="," close=")">
                     #{item}

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/PlanTask.java

@@ -98,6 +98,20 @@ public class PlanTask extends BasicEntity {
 	@Column(name="user_name")
 	private String userName;
 
+	/**
+	 * 任务名称
+	 */
+	@Column(name="plan_name")
+	private String planName;
+
+	public String getPlanName() {
+		return planName;
+	}
+
+	public void setPlanName(String planName) {
+		this.planName = planName;
+	}
+
 	public String getUserName() {
 		return userName;
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentDetailService.java

@@ -24,7 +24,7 @@ public interface IEquipmentDetailService extends IService<EquipmentDetail> {
 
 	Page<EquipmentDetail> page(Page<EquipmentDetail> pageBean, EquipmentDetail equipmentDetail);
 
-	EquipmentDetail getOneById(long id);
+	EquipmentDetail getOneById(Long id);
 
 	boolean removeOneById(long id);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java

@@ -144,8 +144,11 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
     }
 
     @Override
-    public EquipmentDetail getOneById(long id) {
-        EquipmentDetail equipmentDetail = equipmentDetailMapper.selectById(id);
+    public EquipmentDetail getOneById(Long id) {
+        QueryWrapper<EquipmentDetail> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("id",id);
+        EquipmentDetail equipmentDetail = equipmentDetailMapper.selectOne(queryWrapper);
+        System.out.println("======打印ID"+id);
         if (equipmentDetail == null) {
             return null;
         }
@@ -356,6 +359,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
         EquipmentSpecific specific = equipmentSpecificService.getEquipSpecificEntityByCode(equipmentSpecific.getCode());
         equipmentSpecific.setEquipCondition(specific.getEquipCondition());
         equipmentSpecific.setFullqrCode("01#" + equipmentSpecific.getQrCode());
+        System.out.println("==============ID"+equipmentSpecific.getEquipmentDetailId());
         EquipmentDetail equipmentDetail = this.getOneById(equipmentSpecific.getEquipmentDetailId());
         StockDetail stockDetail = null;
         if (stockDetailId != null) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/SupervisionVideoServiceImpl.java

@@ -232,7 +232,14 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
                 } else if (t2.get("update_time") instanceof Boolean) {
                     return  -1;
                 } else {
-                   return Long.valueOf(t1.get("update_time").toString()).compareTo(Long.valueOf(t2.get("update_time").toString()));
+                    try {
+                        Long s1 = DateUtils.dateParse(DateUtils.DATE_TIME_PATTERN, t1.get("update_time").toString()).getTime();
+                        Long s2 = DateUtils.dateParse(DateUtils.DATE_TIME_PATTERN, t2.get("update_time").toString()).getTime();
+                        return s1.compareTo(s2);
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                        return -1;
+                    }
                 }
             });
             pressurePumpInfo.setRecords(records);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -813,6 +813,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                 }
                 planTask.setBeginTime(startTime);
                 planTask.setEndTime(endTime);
+                planTask.setPlanName(plan.getName());
                 // 1.保存执行数据主表
                 iplanTaskDao.saveAndFlush(planTask);
                 // 发送APP待办消息       (20220617  改为定时任务发送消息)

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -6013,6 +6013,7 @@
             cb_water_resource
             <where>
                 (resource_type = 'industryPool' or resource_type = 'pool')
+                and is_delete = 1
                 <if test="bizOrgCode != null and bizOrgCode != ''">
                    AND biz_org_code like concat(#{bizOrgCode}, '%')
                 </if>
@@ -6025,6 +6026,7 @@
             <where>
                 water_status = '2'
                 AND (resource_type = 'industryPool' or resource_type = 'pool')
+                and is_delete = 1
                 <if test="bizOrgCode != null and bizOrgCode != ''">
                     AND biz_org_code like concat(#{bizOrgCode}, '%')
                 </if>
@@ -6037,6 +6039,7 @@
             <where>
                 water_status = '1'
                 AND (resource_type = 'industryPool' or resource_type = 'pool')
+                and is_delete = 1
                 <if test="bizOrgCode != null and bizOrgCode != ''">
                     AND biz_org_code like concat(#{bizOrgCode}, '%')
                 </if>
@@ -6089,6 +6092,7 @@
             cb_water_resource
             <where>
                 (resource_type = 'industryPool' or resource_type = 'pool')
+                and is_delete = 1
                 <if test="bizOrgCode != null and bizOrgCode != ''">
                   AND  biz_org_code like concat(#{bizOrgCode}, '%')
                 </if>
@@ -6096,11 +6100,12 @@
             ) AS total,
 
             (select
-            count(sequence_nbr)
+            count(sequence_nbr)fire-resource-superv
             from
             cb_water_resource
             <where>
                 resource_type = 'pool'
+                and is_delete = 1
                 <if test="bizOrgCode != null and bizOrgCode != ''">
                     AND biz_org_code like concat(#{bizOrgCode}, '%')
                 </if>
@@ -6112,6 +6117,7 @@
             cb_water_resource
             <where>
                 resource_type = 'industryPool'
+                and is_delete = 1
                 <if test="bizOrgCode != null and bizOrgCode != ''">
                     AND biz_org_code like concat(#{bizOrgCode}, '%')
                 </if>

amos-boot-system-patrol/src/main/resources/db/changelog/patrol-3.6.0.xml

@@ -95,4 +95,17 @@
             ADD INDEX `idx_is_ok` (`is_ok`) USING BTREE;
         </sql>
     </changeSet>
+
+    <changeSet author="litw" id="202402261200-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_plan_task" columnName="plan_name"/>
+            </not>
+        </preConditions>
+        <comment>p_plan_task表加字段</comment>
+        <sql>
+            ALTER TABLE `p_plan_task`
+            ADD COLUMN `plan_name` varchar(255) NULL DEFAULT NULL COMMENT '任务名称（冗余）';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file