增加接口

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java

@@ -28,6 +28,14 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
     //BUG 2880  by litw start 2021年9月16日
     List<OrgUsr> selectAllChildrenList(@Param("map")Map<String, Object> map);
 
+
+
+    int getUserByPeopleTypeCount(@Param("map")Map<String, Object> map);
+
+    List<Map<String, Object>> getUserByPeopleType(@Param("map")Map<String, Object> map);
+
+
+
 	List<OrgUsr> selectCompanyDepartmentMsg();
 
 	List<Map<String, Object>> selectPersonAllList(Map<String, Object> map);

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

@@ -1163,4 +1163,88 @@ LEFT JOIN (
         and usr.biz_org_code like CONCAT(#{bizorgcode},'%')
 	    GROUP BY biz_org_name
     </select>
+    <select id="getUserByPeopleTypeCount" resultType="Integer">
+        select
+            count(*)
+         from (
+            SELECT
+            DISTINCT
+            u.sequence_nbr sequenceNbr,
+            u.biz_org_name bizOrgName,
+            g.telephone,
+			g.positionType
+            FROM
+            cb_org_usr u
+
+            LEFT JOIN
+            (  SELECT
+            v.`instance_id`,
+             max(case v.field_code when 'telephone' then IFNULL(v.field_value,'') end) telephone,
+            max(case v.field_code when 'positionType' then IFNULL(v.field_value_label,'') end) positionType,
+            max(case v.field_code when 'peopleType' then IFNULL(v.field_value,'') end) peopleType
+            FROM
+            `cb_dynamic_form_instance` v
+            WHERE
+            v.group_code = 246
+            GROUP BY
+            v.`instance_id`
+            ) g
+
+            on u.sequence_nbr = g.instance_id
+
+            where
+            u.biz_org_type = 'person'
+            AND
+            u.is_delete = 0
+						and g.peopleType=1601
+
+						 GROUP BY
+            u.sequence_nbr
+            order by u.rec_date desc
+            )a where a.sequenceNbr is not null
+
+
+    </select>
+    <select id="getUserByPeopleType" resultType="Map">
+            SET @rownum = #{map.pageNum};
+             select
+                @rownum := @rownum + 1 AS rownum,
+             a.* from (
+            SELECT
+            DISTINCT
+            u.sequence_nbr sequenceNbr,
+            u.biz_org_name bizOrgName,
+            g.telephone,
+			g.positionType
+            FROM
+            cb_org_usr u
+            LEFT JOIN
+            (  SELECT
+            v.`instance_id`,
+            max(case v.field_code when 'telephone' then IFNULL(v.field_value,'') end) telephone,
+            max(case v.field_code when 'positionType' then IFNULL(v.field_value_label,'') end) positionType,
+            max(case v.field_code when 'peopleType' then IFNULL(v.field_value,'') end) peopleType
+            FROM
+            `cb_dynamic_form_instance` v
+            WHERE
+            v.group_code = 246
+            GROUP BY
+            v.`instance_id`
+            ) g
+            on u.sequence_nbr = g.instance_id
+            where
+            u.biz_org_type = 'person'
+            AND
+            u.is_delete = 0
+						and g.peopleType=1601
+						 GROUP BY
+            u.sequence_nbr
+            order by u.rec_date desc
+            )a where a.sequenceNbr is not null
+            LIMIT #{map.pageNum}, #{map.pageSize}
+    </select>
+
+
+
+
 </mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

@@ -254,6 +254,19 @@ public class OrgPersonController extends BaseController {
         return ResponseHelper.buildResponse(orgUsr);
     }
 
+    //驻站消防人员
+    @TycloudOperation( ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/getUserByPeopleType/list", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "消防人员列表分页查询", notes = "消防人员列表分页查询")
+    public ResponseModel<IPage<Map<String, Object>>> getUserByPeopleType(@RequestParam Map<String, Object> requestBody) {
+        Map<String, Object> map = new HashMap<>();
+        IPage<Map<String, Object>> mapIPage = iOrgUsrService.getUserByPeopleType(
+                requestBody.containsKey("pageNum") ? requestBody.get("pageNum").toString()  :  null ,
+                requestBody.containsKey("pageSize") ? requestBody.get("pageSize").toString()  :  null,map );
+        return ResponseHelper.buildResponse(mapIPage);
+    }
+
+
 
 
     /**
@@ -451,7 +464,7 @@ public class OrgPersonController extends BaseController {
  * **/
     /**
      * 根据bizOrgCode查询
-     * @param bizOrgCode
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -3116,7 +3116,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 				dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(dynamicFormInstance.getFieldValue()).getName());
 			}
 			if ("positionType".equals(dynamicFormInstance.getFieldCode()) && peopleInfoDto.getFirefighters().getJobTitleCode() != null){
-				dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(peopleInfoDto.getFirefighters().getJobTitleCode()).getName());
+				dynamicFormInstance.setFieldValueLabel(peopleInfoDto.getFirefighters().getJobTitle());
 			}
 			if ("administrativePositionCode".equals(dynamicFormInstance.getFieldCode()) && firefightersPost.getAdministrativePositionCode() != null){
 				dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(map1.get("administrativePositionCode").toString()).getName());
@@ -3493,4 +3493,23 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return iFirefightersPostService.list(queryWrapper);
 	}
 
+
+	public IPage<Map<String, Object>> getUserByPeopleType(String pageNum, String pageSize, Map<String, Object> map) {
+		IPage<Map<String, Object>> pageBean = null;
+		if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+			pageBean = new Page<>(0, Long.MAX_VALUE);
+		} else {
+			pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+		}
+		pageBean.setTotal(orgUsrMapper.getUserByPeopleTypeCount(map));
+		map.put("pageNum", (pageBean.getCurrent() - 1) * pageBean.getSize());
+		map.put("pageSize", pageBean.getSize());
+
+		List<Map<String, Object>> list = orgUsrMapper.getUserByPeopleType(map);
+		pageBean.setRecords(list);
+		return pageBean;
+	}
+
+
+
 }
\ No newline at end of file

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

@@ -165,6 +165,16 @@ public class FireFightingSystemController extends AbstractBaseController {
         return fireFightingSystemService.getDetailByCode(systemCode);
     }
 
+    //查询系统下设备状态
+    @RequestMapping(value = "/getEquip", method = RequestMethod.GET)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation("通过id查询消防系统信息")
+    public List<Map<String,Object>> getEquip(Long id) {
+
+        return fireFightingSystemService.getEquip(id);
+    }
+
+
     /**
      * 生产厂商列表（不分页）
      *

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java

@@ -637,5 +637,5 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
     Map<String, Object> getStationConnectStatus();
 
     List<Map<String, Object>> getStationStatusStatistics();
-
+    List<Map<String, Object>> getEquip(@Param("id") Long id);
 }

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

@@ -170,7 +170,7 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
      * @return FireFightingSystemEntity
      */
     FireFightingSystemEntity getDetailByCode(String systemCode);
-
+    List<Map<String,Object>> getEquip(Long id);
     /**
      * 集成页面系统数据
      *

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

@@ -977,6 +977,11 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     }
 
     @Override
+    public List<Map<String, Object>> getEquip(Long id) {
+        return fireFightingSystemMapper.getEquip(id);
+    }
+
+    @Override
     public List<AlarmDataVO> getSystemById(Long id) {
         return this.baseMapper.getSystemById(id);
     }

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

@@ -5509,4 +5509,25 @@
             s.id
     </select>
 
+
+    <select id="getEquip" resultType="java.util.Map">
+SELECT    spe.id,
+            det.`name` equipment_name,
+            spe.`code`,
+           ( CASE (select  count(*) from  wl_equipment_specific_alarm where wl_equipment_specific_alarm.equipment_specific_id=spe.id and status=1)
+					WHEN 0 THEN
+						'正常'
+					ELSE
+						'异常'
+				   END ) flag
+        FROM
+            wl_equipment_specific AS spe
+            LEFT JOIN wl_equipment_detail AS det ON spe.equipment_detail_id = det.id
+            LEFT JOIN wl_equipment AS wle ON wle.id = det.equipment_id
+            LEFT JOIN wl_stock_detail AS wlsd on  wlsd.equipment_detail_id = det.id
+       WHERE
+           find_in_set(#{id},spe.system_id) and spe.single = true  and 	wlsd.`status` = 1
+    </select>
+
+
 </mapper>