修改冲突

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -81,7 +81,7 @@ public class ControllerAop {
         // 不需要添加请求头的接口
         String[] url = new String[]{"/api/user/save/curCompany", "/jcs/command/lookHtmlText",
                 "/jcs/common/duty-person/findByDutyAreaId", "/tzs/wechatBack", "/tzs/elevator/getElevatorInfo",
-                "/openapi/bizToken/applyToken","/fire-patrol-report/download","/fire-patrol-report/allPage","/jcs/common/duty-person/new-duty-detail"};
+                "/openapi/bizToken/applyToken","/fire-patrol-report/download","/fire-patrol-report/allPage","/jcs/common/duty-person/new-duty-detail","/equip/car/state/info"};
         // 获取请求路径
         for (String uri : url) {
             if (request.getRequestURI().indexOf(uri) != -1) {

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

@@ -1150,9 +1150,9 @@ LEFT JOIN (
         cfp.fire_management_post,
         cft.type_code,
         cf.certificate_number certificatesNumber,
-        cf.employee_number,
+        ( SELECT field_value FROM cb_dynamic_form_instance dfi WHERE dfi.field_code = 'personNumber' AND dfi.instance_id = u.sequence_nbr ) AS employee_number,
         ( SELECT field_value FROM cb_dynamic_form_instance dfi WHERE dfi.field_code = 'telephone' AND dfi.instance_id = u.sequence_nbr ) AS telephone,
-        ( CASE WHEN cfp.post_qualification IS NULL THEN 0 ELSE 1 END ) AS is_certificate,
+        ( CASE WHEN cfp.post_qualification IS NULL or cfp.post_qualification == ''  THEN 0 ELSE 1 END ) AS is_certificate,
         IF
         (
         ( SELECT field_value FROM cb_dynamic_form_instance dfi WHERE dfi.field_code = 'peopleType' AND dfi.instance_id = u.sequence_nbr ) = 1601,

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java

@@ -261,7 +261,7 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 		orgUsrService.saveFirefightersPost(peopleInfoDto.getPostEduDtoObj(), id);
 
 		// 3.消防人员更新消防表
-		if ("1".equals(peopleInfoDto.getFirefighters().getPeopleType())){
+		if ("1601".equals(peopleInfoDto.getFirefighters().getPeopleType())){
 			// 更新紧急联系人
 			ifirefightersContactsService.updateById(peopleInfoDto.getFirefightersContacts());
 		}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -1231,7 +1231,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		saveOrgUsr(orgUsr, oldOrgUsr);
 		// 保存消防人员表数据
 		QueryWrapper<Firefighters> firefightersQueryWrapper = new QueryWrapper<>();
-		firefightersQueryWrapper.eq("orgUsrId", id);
+		firefightersQueryWrapper.eq("org_usr_id", id);
 		Firefighters fire = firefightersService.getOne(firefightersQueryWrapper);
 		if(!ObjectUtils.isEmpty(fire)) {
 			fire.setName(orgUsr.getBizOrgName());

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarController.java

@@ -1274,7 +1274,7 @@ public class CarController extends AbstractBaseController {
      * @return
      */
     @RequestMapping(value = "/state/info", method = RequestMethod.GET)
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(value = "根据车牌号查询车辆信息", notes = "根据车牌号查询车辆信息")
     public ResponseModel getCarStateInfoByCarNum(@RequestParam(required = false) String carNum) {
         return CommonResponseUtil.success(iCarService.getCarStateInfoByCarNum(carNum));

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

@@ -58,10 +58,12 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
     @Override
     public List<AlamVideoVO> queryVideoList(String bizOrgCode) {
         List<AlamVideoVO> list = supervisionVideoMapper.getVideoByCompany(bizOrgCode);
-        list.forEach(action -> {
-            action.setVedioFormat(action.getVideoType());
-            action.setUrl(videoService.getVideoUrl(action.getName(), action.getPresetPosition(), action.getUrl(), action.getCode()));
-        });
+        if (0 < list.size()) {
+            list.forEach(action -> {
+                action.setVedioFormat(action.getVideoType());
+                action.setUrl(videoService.getVideoUrl(action.getName(), action.getPresetPosition(), action.getUrl(), action.getCode()));
+            });
+        }
         return list;
     }
 

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

@@ -1291,7 +1291,7 @@
              AS `status`
         FROM
         (SELECT ffs.id,ffs.name FROM f_fire_fighting_system ffs
-            WHERE ffs.biz_org_code = #{bizOrgCode}
+            WHERE ffs.biz_org_code like concat(#{bizOrgCode} ,'%')
         ) temp
         LEFT JOIN
         (SELECT esa.system_ids,COUNT(DISTINCT(esa.iot_code)) AS notReturned
@@ -1302,9 +1302,8 @@
         GROUP BY esa.system_ids)temp1
         on
          FIND_IN_SET(temp.id,temp1.system_ids)
-
-             LEFT JOIN
-              (SELECT esa.system_ids,COUNT(DISTINCT(esa.iot_code)) AS total
+        LEFT JOIN
+        (SELECT esa.system_ids,COUNT(DISTINCT(esa.iot_code)) AS total
         FROM wl_equipment_specific_alarm esa
         WHERE esa.type = "BREAKDOWN" and esa.create_date BETWEEN #{startTime}  and  #{endTime}
         GROUP BY esa.system_ids)temp2
@@ -1329,12 +1328,12 @@
         (
         SELECT COUNT(DISTINCT(esa.iot_code))  FROM wl_equipment_specific_alarm esa
         WHERE    esa.org_code =  #{orgCode}
-             and create_date between #{startTime} and #{endTime}
+             and update_date between #{startTime} and #{endTime}
         )AS alarmEquipNum,
         (
         SELECT COUNT(DISTINCT(esa.iot_code)) FROM wl_equipment_specific_alarm esa
         WHERE    esa.org_code =  #{orgCode}   AND esa.equipment_specific_index_value = "true"
-        and create_date between #{startTime} and #{endTime}
+        and update_date between #{startTime} and #{endTime}
         )as notReturned)temp
     </select>
     <select id="inspectionMessage" resultType="java.util.Map">

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

@@ -2201,7 +2201,7 @@
 						)
 					)
 			) AS `todayAlarmNum`,
-		
+
 		IF (
 			(
 				(
@@ -4672,7 +4672,27 @@
     </select>
 
     <select id="getWaterInfoBySuper" resultType="java.util.Map">
-        select * from (
+        select
+        *,
+        (
+        CASE
+
+        WHEN nowLevel IS NOT NULL
+        AND maxLevel IS NOT NULL
+        AND nowLevel - maxLevel > 0 THEN
+        '1'
+        WHEN nowLevel IS NOT NULL
+        AND minLevel IS NOT NULL
+        AND nowLevel != '--'
+        AND nowLevel - minLevel >= 0 THEN
+        '2'
+        WHEN nowLevel IS NOT NULL
+        AND minLevel IS NOT NULL AND nowLevel != '--'
+        AND minLevel - nowLevel > 0 THEN
+        '0' ELSE '4'
+        END
+        ) AS `status`
+        from (
         (SELECT
         r.`name`,
         IFNULL( rp.min_water_level, 0 ) AS minLevel,
@@ -4871,7 +4891,10 @@
             a.nowPressureDate,
             (
                 CASE
-
+                    WHEN nowPressure IS NOT NULL
+                        AND maxLevel IS NOT NULL
+                        AND nowPressure - maxLevel > 0 THEN
+                    '压力高'
                     WHEN nowPressure IS NOT NULL
                         AND minLevel IS NOT NULL
                         AND nowPressure -  minLevel >= 0 THEN

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

@@ -12,7 +12,7 @@
             wv.video_type as videoType,
             wv.preset_position as presetPosition
         from wl_supervision_video wsv left join wl_video  wv on wsv.camera_id = wv.id
-        where wsv.biz_org_code like concat(#{bizOrgCode},'%');
+        where wsv.biz_org_code like concat(#{bizOrgCode},'%') AND wv.id IS NOT NULL;
     </select>
 
     <select id="queryVideoAllId" resultType="java.lang.String">