Merge remote-tracking branch 'origin/develop_dl_plan6_temp' into develop_dl_plan6_temp

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFirefightersService.java

@@ -37,7 +37,7 @@ public interface IFirefightersService {
 
     BigScreen1VO getFireForceInfoByCode(String companyCode);
 
-    String getCompanyName(String bizOrgCode);
+    Map<String,Object> getCompanyName(String bizOrgCode);
 
     List<Map<String, Object>> getUserInfoByYJYA(String bizOrgCode);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/PressurePumpEnum.java

 package com.yeejoin.equipmanage.common.enums;
 
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 public enum PressurePumpEnum {
-    ALONE_START_YXSC("FHS_PressurePump_Start_ALONE_START_YXSC", "", new Date().getSeconds() + " " + new Date().getMinutes() + "/5 * * * ?", "5",
+
+
+
+
+
+    ALONE_START_YXSC("FHS_PressurePump_Start_ALONE_START_YXSC", "", LocalDateTime.now().getSecond() + " " + (LocalDateTime.now().getMinute()) + "/5 * * * ?", "5",
             PressurePumpValueEnum.PUMP_START_TIME.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_QT_WJ_YXSC.getCode(), "【5】分钟"),
 
     ALONE_START_QT("FHS_PressurePump_Start_ALONE_START_QT", PressurePumpCheckEnum.LE.getCode(), "", "5",

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

@@ -331,26 +331,32 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 	}
 
 	@Override
-	public String getCompanyName(String bizOrgCode) {
+	public Map<String,Object> getCompanyName(String bizOrgCode) {
 		LambdaQueryWrapper<OrgUsr> lambda = new QueryWrapper<OrgUsr>().lambda();
 		lambda.eq(OrgUsr::getBizOrgCode, bizOrgCode);
 		lambda.eq(OrgUsr::getIsDelete, false);
 		OrgUsr orgUsr = orgUsrMapper.selectList(lambda).get(0);
 		if (!ObjectUtils.isEmpty(orgUsr.getBizOrgType()) && "COMPANY".equals(orgUsr.getBizOrgType())) {
-			return orgUsr.getBizOrgName();
+			Map<String,Object> map = new HashMap<>();
+			map.put("bizOrgCode",orgUsr.getBizOrgCode());
+			map.put("bizOrgName",orgUsr.getBizOrgName());
+			return map;
 		} else {
 			return getCompanyNameById(orgUsr.getParentId());
 		}
 
 	}
 
-	private String getCompanyNameById(String id) {
+	private Map<String,Object> getCompanyNameById(String id) {
 		LambdaQueryWrapper<OrgUsr> lambda = new QueryWrapper<OrgUsr>().lambda();
 		lambda.eq(OrgUsr::getSequenceNbr, id);
 		lambda.eq(OrgUsr::getIsDelete, false);
 		OrgUsr orgUsr = orgUsrMapper.selectList(lambda).get(0);
 		if (!ObjectUtils.isEmpty(orgUsr.getBizOrgType()) && "COMPANY".equals(orgUsr.getBizOrgType())) {
-			return orgUsr.getBizOrgName();
+			Map<String,Object> map = new HashMap<>();
+			map.put("bizOrgCode",orgUsr.getBizOrgCode());
+			map.put("bizOrgName",orgUsr.getBizOrgName());
+			return map;
 		} else {
 			return getCompanyNameById(orgUsr.getParentId());
 		}

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

@@ -132,13 +132,11 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 		if (linkageUnitDto.getAddress() != null) {
 			JSONObject address = WaterResourceServiceImpl.getLongLatFromAddress(linkageUnitDto.getAddress());
 			linkageUnitDto.setAddress(address.getString(BizConstant.ADDRESS));
-			String[] addressArr = linkageUnitDto.getAddress().split("@address@");
-			JSONObject jsonObject = JSONObject.parseObject(addressArr[1]);
-			if (StringUtils.isNotEmpty(jsonObject.getString(BizConstant.LONGITUDE))) {
-				linkageUnitDto.setLongitude(Double.valueOf(jsonObject.getString(BizConstant.LONGITUDE)));
+			if (StringUtils.isNotEmpty(address.getString(BizConstant.LONGITUDE))) {
+				linkageUnitDto.setLongitude(Double.valueOf(address.getString(BizConstant.LONGITUDE)));
 			}
-			if (StringUtils.isNotEmpty(jsonObject.getString(BizConstant.LATITUDE))) {
-				linkageUnitDto.setLatitude(Double.valueOf(jsonObject.getString(BizConstant.LATITUDE)));
+			if (StringUtils.isNotEmpty(address.getString(BizConstant.LATITUDE))) {
+				linkageUnitDto.setLatitude(Double.valueOf(address.getString(BizConstant.LATITUDE)));
 			}
 		}
 		// 1.保存行数据

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

@@ -1710,7 +1710,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		// BUG 2843 过滤没有绑定关联账户的user by kongfm 2021-09-16
 		List<OrgUsr> tempUserList = this
 				.list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getIsDelete, false).eq(OrgUsr::getParentId, parentId)
-						.eq(OrgUsr::getBizOrgType, bizOrgType).isNotNull(OrgUsr::getAmosOrgId));
+						.eq(OrgUsr::getBizOrgType, bizOrgType));
 		tempUserList.stream().forEach(m -> {
 			if (StringUtils.isNotEmpty(m.getAmosOrgId())) {
 				FeignClientResult<AgencyUserModel> result1 = Privilege.agencyUserClient.queryByUserId(m.getAmosOrgId());
@@ -3443,6 +3443,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	public String deleteFirefighters(Long userId){
 		QueryWrapper<Firefighters> firefightersQueryWrapper = new QueryWrapper<>();
 		Firefighters firefighters = iFirefightersService.getOne(firefightersQueryWrapper.eq("org_usr_id", userId).eq("is_delete", 0));
+		if(ObjectUtils.isEmpty(firefighters)){
+			return "0";
+		}
 		Long id = firefighters.getSequenceNbr();
 
 		//BUG 2761 判断人员删除时的逻辑 如果被选为队伍联系人则无法被删除 bykongfm

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

@@ -38,7 +38,7 @@ public class PersonIdentifyAspect {
     @Autowired
     private JcsFeign jcsFeignClient;
 
-    @Pointcut("execution(public * com.yeejoin.amos.*.business.controller..*(..))")
+    @Pointcut("execution(public * com.*.equipmanage.controller..*(..))")
     public void userDate() {
 
     }
@@ -57,7 +57,9 @@ public class PersonIdentifyAspect {
                         if (ObjectUtils.isEmpty(responseModel.getResult()) || responseModel.getStatus() != HttpStatus.OK.value()) {
                             throw new RuntimeException(responseModel.getDevMessage());
                         }
-                        ReginParams.PersonIdentity personIdentity = (ReginParams.PersonIdentity) Bean.mapToBean((Map<String, Object>) responseModel.getResult(), ReginParams.PersonIdentity.class);
+//                        ReginParams.PersonIdentity personIdentity = (ReginParams.PersonIdentity) Bean.mapToBean((Map<String, Object>) responseModel.getResult(), ReginParams.PersonIdentity.class);
+                        String s = JSONObject.toJSONString(responseModel.getResult());
+                        ReginParams.PersonIdentity personIdentity = JSONObject.parseObject(s, ReginParams.PersonIdentity.class);
                         reginParam.setPersonIdentity(personIdentity);
                         redisUtils.set(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()), JSONObject.toJSONString(reginParam));
                     }

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

@@ -49,6 +49,7 @@ import java.math.BigInteger;
 import java.math.RoundingMode;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -1597,8 +1598,23 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 
     private void startTimeCompute(String indexKey, TopicEntityVo topicEntity, PressurePumpEnum pressurePumpEnum) {
         String jobName = topicEntity.getIotCode()+"_"+indexKey;
+
+
+        String cron ="";
         String triggerName = PUMP_TRIGGER_NAME+"-"+topicEntity.getIotCode();
-        String cron = pressurePumpEnum.getLeftValue();
+
+        if("FHS_PressurePump_Start_ALONE_START_YXSC".equals(pressurePumpEnum.getCode())){
+
+         Calendar time= Calendar.getInstance();
+         time.add(Calendar.MINUTE,5);
+            cron = time.get(Calendar.SECOND) + " " + time.get(Calendar.MINUTE) + "/5 * * * ?";
+
+        }else{
+            cron = pressurePumpEnum.getLeftValue();
+        }
+
+
+
         EquipmentSpecific equipmentSpecific = null;
         try {
             LambdaQueryWrapper<EquipmentSpecific> wrapper = new LambdaQueryWrapper<>();

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -524,19 +524,19 @@ public class FirefightersController extends BaseController {
 //            firefightersQueryWrapper2.eq("amos_user_id",reginParam.getUserModel().getUserId());
 //            Firefighters one = iFirefightersService.getOne(firefightersQueryWrapper2);
             List<Map<String,Object>> list = new ArrayList<>();
+            Map<String,Object> bizOrgCodeAndBizOrgName = iFirefightersService.getCompanyName(bizOrgCode);
 
             QueryWrapper<Firefighters> firefightersQueryWrapper1 = new QueryWrapper<>();
-            firefightersQueryWrapper1.like("biz_org_code", bizOrgCode);
+            firefightersQueryWrapper1.like("biz_org_code", bizOrgCodeAndBizOrgName.get("bizOrgCode"));
             firefightersQueryWrapper1.eq("people_type", "1601");
             firefightersQueryWrapper1.eq("is_delete", "0");
-            String companyName = iFirefightersService.getCompanyName(bizOrgCode);
             List<Firefighters> firefighters = iFirefightersService.getBaseMapper().selectList(firefightersQueryWrapper1);
             firefighters.stream().forEach(e -> {
                 Map<String, Object> map = new HashMap<>();
                 map.put("name", e.getName());
                 map.put("jobTitle", e.getJobTitle());
-                map.put("bizOrgName", companyName);
-                map.put("bizOrgCode", bizOrgCode);
+                map.put("bizOrgName", bizOrgCodeAndBizOrgName.get("bizOrgName"));
+                map.put("bizOrgCode", bizOrgCodeAndBizOrgName.get("bizOrgCode"));
                 map.put("amosUserId", e.getOrgUsrId());
                 map.put("personnelPhotos", e.getPersonnelPhotos());
                 list.add(map);

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/SignServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.SinStaticDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Sign;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.SignMapper;
@@ -26,6 +27,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.text.NumberFormat;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 打卡记录服务实现类
@@ -46,6 +48,8 @@ public class SignServiceImpl extends BaseService<SignDto,Sign,SignMapper> implem
     @Value("${mqtt.topic.person.sign.zxj:sign/data/synZxj}")
     private String personSignZxj;
 
+    @Autowired
+    FirefightersServiceImpl iFirefightersService;
     /**
      * 分页查询
      */
@@ -120,7 +124,8 @@ public class SignServiceImpl extends BaseService<SignDto,Sign,SignMapper> implem
     @Override
     public Boolean saveSign(SignDto dot) {
         Sign sign = new Sign();
-        int num = this.baseMapper.queryPersonNum(dot.getBizOrgCode());
+        Map<String,Object> bizOrgCodeAndBizOrgName = iFirefightersService.getCompanyName(dot.getBizOrgCode());
+        int num = this.baseMapper.queryPersonNum(bizOrgCodeAndBizOrgName.get("bizOrgCode").toString());
         Bean.copyExistPropertis(dot,sign);
         sign.setPersonOfDay(String.valueOf(num));
         boolean save = this.save(sign);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/InputItemController.java

@@ -552,10 +552,19 @@ public class InputItemController extends AbstractBaseController {
 	@RequestMapping(value = "/addItemNew", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
 	public CommonResponse addNewItemNew(@ApiParam(value = "检查项信息") @RequestBody InputItemParam param) {
 
-		if (param.getEquipmentType() == null && param.getCustomType() == null&&param.getFacilitiesType() == null&&param.getKeyPartsType() == null){
-			throw new BadRequest("适用类型至少需选择一项");
+
+
+        if(param.getId()>0){
+			if (param.getEquipmentType()==null  && param.getCustomType()==null &&param.getFacilitiesType() == null&&param.getKeyPartsType() == null){
+				throw new BadRequest("适用类型至少需选择一项");
+			}
+		}else{
+			if ("1".equals(param.getEquipmentType())  && "1".equals(param.getCustomType()) &&param.getFacilitiesType() == null&&param.getKeyPartsType() == null){
+				throw new BadRequest("适用类型至少需选择一项");
+			}
 		}
 
+
 		if (CollectionUtils.isNotEmpty(inputItemDao.findByItemNo(param.getItemNo(), param.getId() != 0 ? String.valueOf(param.getId()) : null))) {
 			throw new BadRequest("该编号已存在,请重新输入");
 		}

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

@@ -5073,7 +5073,8 @@
             IF
                 (
                         max( CASE WHEN fi.field_name = 'maxPressure' THEN fi.field_value END ) = ''
-                        OR max( CASE WHEN fi.field_name = 'maxPressure' THEN fi.field_value END ) IS NULL,
+                        OR max( CASE WHEN fi.field_name = 'maxPressure' THEN fi.field_value END ) IS NULL
+                        OR max( CASE WHEN fi.field_name = 'maxPressure' THEN fi.field_value END ) = 'null',
                         0,
                         max( CASE WHEN fi.field_name = 'maxPressure' THEN fi.field_value END )) AS maxValues
         FROM

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -3750,5 +3750,20 @@
             REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `extend`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1805, '1805', '灭火抢险救援类', 'GWMC', NULL, NULL, NULL, NULL, NULL, NULL, b'0', 25);
         </sql>
     </changeSet>
+
+
+<!--    <changeSet author="tw" id="20221909-1">-->
+<!--        <preConditions onFail="MARK_RAN">-->
+<!--            <tableExists tableName="cb_sign"/>-->
+<!--        </preConditions>-->
+<!--        <comment>修改人员岗位长度</comment>-->
+<!--        <sql>-->
+<!--            ALTER TABLE cb_sign MODIFY COLUMN job_title text;-->
+<!--        </sql>-->
+<!--    </changeSet>-->
+
+
+
+
 </databaseChangeLog>
 

amos-boot-system-patrol/src/main/resources/db/mapper/pointMapper.xml

@@ -453,6 +453,7 @@
 			ppc.`name`,
 			ppc.order_no orderNo,
 		    ppc.equipment_id equipmentId,
+			ppc.code,
 			ppc.data_source_code dataSourceCode
 		FROM
 			`p_route_point_item` prpi