Merge branch 'develop_dl_plan6_temp' of…

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/core/framework/PersonIdentifyAspect.java

@@ -47,6 +47,7 @@ public class PersonIdentifyAspect {
             personIdentity.setPersonSeq(userDto.getPersonSeq());
             personIdentity.setPersonName(userDto.getPersonName());
             personIdentity.setIdentityType(userDto.getIdentityType());
+            personIdentity.setCompanyBizOrgCode(userDto.getCompanyBizOrgCode());
             reginParam.setPersonIdentity(personIdentity);
             redisUtils.set(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()), JSONObject.toJSONString(reginParam));
         }

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

@@ -245,6 +245,25 @@ public class OrgPersonController extends BaseController {
     }
 
 
+
+    @PersonIdentify
+    @TycloudOperation( ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/listAllByCurrentUserALL", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "列表分页查询(表单用)", notes = "列表分页查询（表单用）")
+    public ResponseModel<Object> listAllByCurrentUserALL() {
+        Map<String, Object> req = new HashMap<>();
+        ReginParams reginParams = getSelectedOrgInfo();
+        String bizOrgCode = reginParams.getPersonIdentity().getCompanyBizOrgCode();
+        req.put("bizOrgCode", bizOrgCode);
+//        if(redisUtils.get("userList:" + bizOrgCode) != null){
+//            return ResponseHelper.buildResponse(redisUtils.get("userList:" + bizOrgCode));
+//        }
+        return ResponseHelper.buildResponse(iOrgUsrService.listAllByCurrentUser(null, null, req));
+    }
+
+
+
+
     @TycloudOperation( ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getUserByCode/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")

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

@@ -2798,6 +2798,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 				userDto.setBizOrgCode(bizOrg.getBizOrgCode());
 				userDto.setCompanyId(String.valueOf(bizOrg.getSequenceNbr()));
 				userDto.setCompanyName(bizOrg.getBizOrgName());
+				if(bizOrg.getBizOrgType().equals("COMPANY")){
+					userDto.setCompanyBizOrgCode(bizOrg.getBizOrgCode());
+				}else{
+					userDto.setCompanyBizOrgCode(getCompany(bizOrg));
+				}
 			} else {
 				throw new RuntimeException("人员所在公司不存在");
 			}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/config/PersonIdentifyAspect.java

@@ -50,7 +50,7 @@ public class PersonIdentifyAspect {
             ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
 
             if (reginParam != null) {
-                if (reginParam.getPersonIdentity() == null || reginParam.getPersonIdentity().getBizOrgCode() == null) {
+                if (reginParam.getPersonIdentity() == null || StringUtils.isEmpty(reginParam.getPersonIdentity().getBizOrgCode()) || StringUtils.isEmpty(reginParam.getPersonIdentity().getCompanyBizOrgCode())) {
                     String userId = reginParam.getUserModel().getUserId();
                     if (userId != null) {
                         FeignClientResult responseModel = jcsFeignClient.selectById(userId);

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

@@ -709,7 +709,7 @@ public class ConfigureController extends AbstractBaseController {
             ReginParams reginParams = getSelectedOrgInfo();
             ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
             if (!ValidationUtil.isEmpty(personIdentity)) {
-                bizOrgCode = personIdentity.getBizOrgCode();
+                bizOrgCode = personIdentity.getCompanyBizOrgCode();
             }
         }
         if (ObjectUtils.isEmpty(bizOrgCode)){

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

@@ -923,7 +923,7 @@ public class FireFightingSystemController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "装备信息导出", notes = "装备信息导出")
     @PostMapping(value = "/downParameter")
-    public void export(HttpServletResponse response, EquipTypeAmountPageDTO dto) {
+    public void export(HttpServletResponse response,@RequestBody EquipTypeAmountPageDTO dto) {
         List<EquipmentExportVO> list = fireFightingSystemMapper.exportEquipmentList(dto);
         if (!CollectionUtils.isEmpty(list)) {
             for (EquipmentExportVO vo : list) {

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

@@ -45,13 +45,7 @@ public class StatisticsController {
 	}
 
 
-	@RequestMapping(value = "/getwarehouseId", method = RequestMethod.GET)
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
-	public Map<String, Object> getEquipmentStatusByWarehouseId() {
-		return iStatisticsService.getWarehouseId(stationCode);
-
-	}
+	
 
 	/**
 	 * 根据装备状态统计总数(按仓库)

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

@@ -1211,7 +1211,7 @@ public class TopographyController extends AbstractBaseController {
             if(Integer.parseInt(arr[0]) < 10 ) {
                 sStr = "0" + arr[0];
             } else {
-                sStr = arr[1];
+                sStr = arr[0];
             }
             if(Integer.parseInt(arr[1]) < 10 ) {
                 eStr = "0" + arr[1];
@@ -1222,11 +1222,11 @@ public class TopographyController extends AbstractBaseController {
 
                 bDate = DateUtils.dateParse(DateUtils.dateToStringMonth(beginDate) + "-" + sStr + " 00:00:00" ,DateUtils.DATE_TIME_PATTERN);
                 dDate = DateUtils.dateParse(DateUtils.dateToStringMonth(beginDate) + "-" + eStr + " 23:59:59"
-                        ,DateUtils.DATE_PATTERN);
+                        ,DateUtils.DATE_TIME_PATTERN);
             } else {
 
                 bDate = DateUtils.dateParse(DateUtils.dateToStringMonth(beginDate) + "-" + sStr + " 00:00:00",DateUtils.DATE_TIME_PATTERN);
-                dDate = DateUtils.dateParse(DateUtils.dateToStringMonth(beginDate) + "-" + eStr + " 00:00:00",DateUtils.DATE_TIME_PATTERN);
+                dDate = DateUtils.dateParse(DateUtils.dateToStringMonth(beginDate) + "-" + eStr + " 23:59:59",DateUtils.DATE_TIME_PATTERN);
             }
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/SystemctlFeign.java

 package com.yeejoin.equipmanage.fegin;
 
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
@@ -29,4 +26,8 @@ public interface SystemctlFeign {
             @RequestHeader("token") String token,
             @RequestBody MessageModel model);
 
+    @RequestMapping(value = "/systemctl/v1/message/{sequenceNbr}", method = RequestMethod.PUT, consumes = "application/json")
+    ResponseModel<MessageModel> updateIsRead(@PathVariable(value = "sequenceNbr") Long sequenceNbr
+          );
+
 }

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

@@ -174,7 +174,7 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
     Map<String,Double> getEquipLocationInfo(Long equipmentSpecificId);
 
     Map<String, Object> getEquipSpeInfo(@Param("equipmentSpecificId") Long equipmentSpecificId);
-    Map<String, Object>   getWarehouseId(@Param("code") String code);
+
     /**
      * 根据specificId删除装备相关数据
      * @param specificId specificId

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

@@ -22,5 +22,5 @@ public interface IStatisticsService {
 	 */
     List<EquipCategoryVo> equipCategoryVoList(String systemCode);
 
-	Map<String, Object> getWarehouseId(String orgcode);
+
 }

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

 package com.yeejoin.equipmanage.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,10 +14,7 @@ import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.dto.AlarmDTO;
 import com.yeejoin.equipmanage.common.entity.dto.EquipSpecificAlarmDTO;
 import com.yeejoin.equipmanage.common.entity.vo.VideoVO;
-import com.yeejoin.equipmanage.common.enums.AlarmGridColumnEnum;
-import com.yeejoin.equipmanage.common.enums.AlarmTypeEnum;
-import com.yeejoin.equipmanage.common.enums.ConfirmAlamEnum;
-import com.yeejoin.equipmanage.common.enums.EquipmentDataEnum;
+import com.yeejoin.equipmanage.common.enums.*;
 import com.yeejoin.equipmanage.common.utils.CommonPageInfoParam;
 import com.yeejoin.equipmanage.common.utils.DateUtils;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
@@ -95,6 +93,9 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
     @Autowired
     JcsFeign jcsFeign;
 
+    @Autowired
+    MqttSendGateway mqttSendGateway;
+
     @Override
     public void handleExport(HttpServletResponse response, List<Long> ids, String alarmType) {
         CommonPageInfoParam param = new CommonPageInfoParam();
@@ -796,18 +797,20 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
         MarqueeData marqueeData = marqueeDataMapper.selectById(messageId);
         marqueeData.setIsRead(1);
         int i = marqueeDataMapper.updateById(marqueeData);
-        MessageModel model = new MessageModel();
-        model.setMsgType("pressurePump");
-        model.setSendTime(new Date());
-        model.setIsSendWeb(true);
-        model.setCategory(1);
-        model.setIsSendApp(false);
-        model.setTerminal("WEB");
-        Map<String, String> ext = new HashMap<>();
-        ext.put("isRead", "1");
-        model.setExtras(ext);
+//        MessageModel model = new MessageModel();
+//        model.setMsgType("pressurePump");
+//        model.setSendTime(new Date());
+//        model.setIsSendWeb(true);
+//        model.setCategory(1);
+//        model.setIsSendApp(false);
+//        model.setTerminal("WEB");
+//        Map<String, String> ext = new HashMap<>();
+//        ext.put("isRead", "1");
+//        model.setExtras(ext);
         Token token = remoteSecurityService.getServerToken();
-        systemctlFeign.create(token.getAppKey(), token.getProduct(), token.getToke(), model);
+//        systemctlFeign.create(token.getAppKey(), token.getProduct(), token.getToke(), model);
+        systemctlFeign.updateIsRead(Long.valueOf(messageId));
+        mqttSendGateway.sendToMqtt("pressurePump", "1");
         return i;
     }
 }

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

@@ -221,11 +221,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
 		return equipmentSpecificMapper.selectEquipCategoryNumber(fightingSystemEntity.getId());
 	}
 
-	@Override
-	public Map<String, Object> getWarehouseId(String orgcode) {
-		Map<String, Object> map=equipmentSpecificMapper.getWarehouseId(orgcode);
-		return map;
-	}
+
 
 	private Double getExtinguishingCountByWarehouseId(String categoryCode, Long warehouseId) {
 		List<EquipmentCategory> categoryList = iEquipmentCategoryService

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/config/PersonIdentifyAspect.java

@@ -56,7 +56,7 @@ public class PersonIdentifyAspect {
         }else {
         ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         if (reginParam != null ) {
-            if (reginParam.getPersonIdentity() == null || reginParam.getPersonIdentity().getCompanyBizOrgCode() == null) {
+            if (reginParam.getPersonIdentity() == null || StringUtils.isEmpty(reginParam.getPersonIdentity().getBizOrgCode()) || StringUtils.isEmpty(reginParam.getPersonIdentity().getCompanyBizOrgCode())) {
                 String userId = reginParam.getUserModel().getUserId();
 
                 if (userId != null) {

amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml

@@ -512,4 +512,18 @@
         </sql>
     </changeSet>
 
+
+    <changeSet author="tw" id="20221213-1">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="idx_biz_station_info"/>
+        </preConditions>
+        <comment>删除字段</comment>
+        <sql>
+            alter table idx_biz_station_info DROP COLUMN warehouse_id;
+        </sql>
+    </changeSet>
+
+
+
+
 </databaseChangeLog>
\ No newline at end of file

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

@@ -1406,9 +1406,7 @@
 
 
 
-    <select id="getWarehouseId" resultType="Map">
-        select warehouse_id as warehouseId from  idx_biz_station_info where code =  #{code}
-    </select>
+
 
 
     <delete id="deleteEquipDataBySpecificId">