Merge branch 'developer' into develop_ccs

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/UnitInfoMapper.java

@@ -24,4 +24,6 @@ public interface UnitInfoMapper extends BaseMapper<UnitInfo> {
                                           @Param("address") String address,
                                           @Param("orgName") String orgName,
                                           @Param("organizationCode") String organizationCode);
+
+    List<UnitInfo> getUnitWithoutQrcode();
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/IUnitInfoService.java

@@ -40,4 +40,6 @@ public interface IUnitInfoService {
     List<UnitInfoDto> getAllUnit();
 
     List<UnitInfoDto> getUseUnit(String unitType, String address, String orgName, String organizationCode);
+
+    Boolean addQRcode();
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/UnitInfoMapper.xml

@@ -51,4 +51,21 @@
     </select>
 
 
+
+
+	<select id="getUnitWithoutQrcode" resultType="com.yeejoin.amos.boot.module.tzs.flc.api.entity.UnitInfo">
+		SELECT
+	a.*
+FROM
+	tz_flc_unit_info a
+	LEFT JOIN cb_source_file f on f.source_id = a.sequence_nbr and f.file_category = 'qrCode'
+WHERE
+	a.is_delete = 0
+	AND (
+	a.unit_status = '1'
+	OR a.is_change = 1)
+	and f.sequence_nbr is null
+	</select>
+
+
 </mapper>

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

@@ -125,7 +125,7 @@ public class EquipmentIndexImpl extends ServiceImpl<EquipmentIndexMapper, Equipm
                     equipmentSpecificIndex.setEquipmentSpecificId(y.getId());
                     equipmentSpecificIndex.setEquipmentIndexId(equipmentIndex.getId());
                     equipmentSpecificIndex.setEquipmentIndexKey(equipmentIndex.getPerfQuotaDefinitionId());
-                    equipmentSpecificIndex.setEquipmentSpecificIndexName(equipmentIndex.getPerfQuotaName());
+                    equipmentSpecificIndex.setEquipmentIndexName(equipmentIndex.getPerfQuotaName());
                     equipmentSpecificIndex.setEquipmentSpecialName(y.getName());
                     equipmentSpecificIndexList.add(equipmentSpecificIndex);
                 });

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

@@ -1613,20 +1613,20 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             if (!ObjectUtils.isEmpty(equipmentSpecific)) {
                 QueryWrapper<VideoEquipmentSpecific> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("equipment_specific_id", equipmentSpecificId);
-                boolean remove = videoEquipmentSpecificService.remove(queryWrapper);
-                if (remove) {
-                    List<VideoEquipmentSpecific> videoSpecificList = new ArrayList<>();
-                    videoIdList.parallelStream().forEach(x -> {
-                        VideoEquipmentSpecific videoEquipmentSpecific = new VideoEquipmentSpecific();
-                        videoEquipmentSpecific.setVideoId(x);
-                        videoEquipmentSpecific.setEquipmentSpecificId(equipmentSpecificId);
-                        videoSpecificList.add(videoEquipmentSpecific);
-                    });
-                    videoEquipmentSpecificService.saveBatch(videoSpecificList);
+                if (0 == videoIdList.size()) {
+                    videoEquipmentSpecificService.remove(queryWrapper);
                     return Boolean.TRUE;
+                }
+                List<VideoEquipmentSpecific> list = videoEquipmentSpecificService.getBaseMapper().selectList(queryWrapper);
+                if (0 < list.size()) {
+                    boolean remove = videoEquipmentSpecificService.remove(queryWrapper);
+                    if (remove) {
+                        this.bingEquipmentRelationshipToVideo(videoIdList, equipmentSpecificId);
+                    }
                 } else {
-                    throw new RuntimeException("设备摄像头绑定关系中此设备不存在！");
+                    this.bingEquipmentRelationshipToVideo(videoIdList, equipmentSpecificId);
                 }
+                return Boolean.FALSE;
             } else {
                 throw new RuntimeException("未获取到此设备！");
             }
@@ -1634,4 +1634,17 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             throw new RuntimeException("设备ID为空！");
         }
     }
+
+    private Boolean bingEquipmentRelationshipToVideo(List<Long> videoIdList, Long equipmentSpecificId) {
+        List<VideoEquipmentSpecific> videoSpecificList = new ArrayList<>();
+        videoIdList.parallelStream().forEach(x -> {
+            VideoEquipmentSpecific videoEquipmentSpecific = new VideoEquipmentSpecific();
+            videoEquipmentSpecific.setVideoId(x);
+            videoEquipmentSpecific.setEquipmentSpecificId(equipmentSpecificId);
+            videoSpecificList.add(videoEquipmentSpecific);
+        });
+        videoEquipmentSpecificService.saveBatch(videoSpecificList);
+        return Boolean.TRUE;
+    }
+
 }

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

@@ -30,7 +30,8 @@ public class MqttEventReceiveServiceImpl implements MqttEventReceiveService {
       JSONObject eventJson = JSONObject.parseObject(event);
       
       String eventContent = eventJson.getString("eventContent");
-      String eventType = eventJson.getString("eventType");
+      String eventType = String.valueOf(eventJson.get("eventType")).toString();
+      
       String eventPic = eventJson.getString("pic");
       
       List<String> eventPicList = new ArrayList<String>();

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/AlertCalledController.java

@@ -592,7 +592,23 @@ public class AlertCalledController extends BaseController {
 		updateWrapper.set(AlertCalled::getForzenResult, alertCalledDto.getForzenResult());
 		updateWrapper.set(AlertCalled::getAlertStatus, true);
 		updateWrapper.eq(AlertCalled::getSequenceNbr, alertCalledDto.getSequenceNbr());
-		return ResponseHelper.buildResponse(iAlertCalledService.update(updateWrapper));
+		Boolean flag = iAlertCalledService.update(updateWrapper);
+		if(flag) {
+			AlertCalledDto alertCalledVo = iAlertCalledService.queryBySeq(alertCalledDto.getSequenceNbr());
+			try {
+				redisUtils.del(RedisKey.TZS_ALERTCALLED_ID+alertCalledVo.getSequenceNbr());
+			} catch (Exception e) {
+				e.printStackTrace();
+				logger.error("删除redis失败:" + e.getMessage());
+			}
+			try {
+				eSAlertCalledService.updateEsAlertCalled(alertCalledVo);
+			} catch (Exception e) {
+				e.printStackTrace();
+				logger.error("更新es失败:" + e.getMessage());
+			}
+		}
+		return ResponseHelper.buildResponse(flag);
 	}
 
 	/**
@@ -612,7 +628,23 @@ public class AlertCalledController extends BaseController {
 		updateWrapper.set(AlertCalled::getFinalReason, alertCalledDto.getFinalReason());
 		updateWrapper.set(AlertCalled::getAlertStatus, true);
 		updateWrapper.eq(AlertCalled::getSequenceNbr, alertCalledDto.getSequenceNbr());
-		return ResponseHelper.buildResponse(iAlertCalledService.update(updateWrapper));
+		Boolean flag = iAlertCalledService.update(updateWrapper);
+		if(flag) {
+			AlertCalledDto alertCalledVo = iAlertCalledService.queryBySeq(alertCalledDto.getSequenceNbr());
+			try {
+				redisUtils.del(RedisKey.TZS_ALERTCALLED_ID+alertCalledVo.getSequenceNbr());
+			} catch (Exception e) {
+				e.printStackTrace();
+				logger.error("删除redis失败:" + e.getMessage());
+			}
+			try {
+				eSAlertCalledService.updateEsAlertCalled(alertCalledVo);
+			} catch (Exception e) {
+				e.printStackTrace();
+				logger.error("更新es失败:" + e.getMessage());
+			}
+		}
+		return ResponseHelper.buildResponse(flag);
 	}
 
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/UnitInfoController.java

@@ -533,5 +533,33 @@ public class UnitInfoController extends BaseController {
 	}
 
 
+	/**
+	 * 判断用户号码是否存在
+	 *
+	 * @return
+	 */
+	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/hasExistPhone/{phone}")
+	@ApiOperation(httpMethod = "GET", value = "判断用户号码是否存在", notes = "判断用户号码是否存在")
+	public ResponseModel<Boolean> hasExistPhone( @PathVariable(value = "phone") String phone) {
+		Boolean flag = Privilege.agencyUserClient.checkLoginId(phone).getResult();
+		return ResponseHelper.buildResponse(flag);
+	}
+
+
+	/**
+	 * 手动生成已通过企业的二维码
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/addQRcode")
+	@ApiOperation(httpMethod = "GET", value = "手动生成已通过企业的二维码", notes = "手动生成已通过企业的二维码")
+	public ResponseModel<Boolean> addQRcode() {
+		Boolean flag = unitInfoServiceImpl.addQRcode();
+		return ResponseHelper.buildResponse(flag);
+	}
+
+
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/UnitInfoServiceImpl.java

@@ -558,6 +558,16 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
     }
 
     @Override
+    public Boolean addQRcode() {
+        // 获取所有已经通过的且没有二维码的企业信息
+        List<UnitInfo> list = baseMapper.getUnitWithoutQrcode();
+        list.stream().forEach(t -> {
+            this.saveUnitInfoQrCode(t);
+        });
+        return true;
+    }
+
+    @Override
     public List<UnitInfoDto> getAllUnit() {
         return baseMapper.getAllUnit();
     }

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

@@ -189,7 +189,7 @@
         wlesal.equipment_index_id AS fireEquipmentIndexId,
         wlesal.equipment_specific_index_key AS fireEquipmentSpecificIndexKey,
         wlesal.equipment_specific_index_name AS fireEquipmentSpecificIndexName,
-        wlesal.build_id AS buildId,
+        wles.warehouse_structure_id AS buildId,
         we.img AS imgUrl,
         CASE
         wlesal.equipment_specific_index_value
@@ -199,7 +199,7 @@
         AS fireEquipmentPointValue,
         wlesal.type AS type,
         wlesal.create_date AS createDate,
-        CONCAT_WS(' ',ware.full_name,wsd.description) AS warehouseStructureName,
+        CONCAT_WS(' ',ware.full_name,wsd.description,wled.area) AS warehouseStructureName,
         (select
         group_concat(fet.`name`)
         from f_equipment_fire_equipment as fefe

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

@@ -353,7 +353,8 @@
         category.NAME AS categoryName,
         category.CODE AS categoryCode,
         equipment_detail.area AS address,
-        CONCAT(area.prevName,'-',structure.NAME) AS acre,
+        <!-- CONCAT(area.prevName,'-',structure.NAME) AS acre,-->
+        spec.position AS acre,
         we.inspection_spec as inspectionSpecId,
         0 as orderNo
         FROM
@@ -390,7 +391,7 @@
         </if>
         <if test="equipCode != '' and equipCode != null">and spec.code like concat("%", #{equipCode}, "%")</if>
         <if test="equipName != '' and equipName != null">
-            and equipment_detail.name like CONCAT("%", #{equipName},'%')
+            and spec.name like CONCAT("%", #{equipName},'%')
         </if>
     </select>
 

amos-boot-system-patrol/src/main/resources/application-dev.properties

-eureka.client.serviceUrl.defaultZone=http://172.16.10.72:10001/eureka/
+eureka.client.serviceUrl.defaultZone=http://172.16.11.20:10001/eureka/
 eureka.client.registry-fetch-interval-seconds=5
 eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
@@ -17,9 +17,9 @@ ribbon.MaxAutoRetriesNextServer = 2
 ribbon.MaxAutoRetries = 1
 
 #DB properties:
-spring.datasource.url = jdbc:mysql://172.16.6.60:3306/safety-business-3.0.1?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
-spring.datasource.username= root
-spring.datasource.password= root_123
+spring.datasource.url = jdbc:mysql://172.16.3.20:3307/autosys_business_v3.0.1.3?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.username=root
+spring.datasource.password=123456
 spring.datasource.driver-class-name = com.mysql.jdbc.Driver
 spring.datasource.hikari.maxLifetime = 1765000
 spring.datasource.hikari.maximum-pool-size = 10
@@ -33,10 +33,10 @@ security.productApp=STUDIO_APP_MOBILE
 security.appKey=studio_normalapp_3168830
 
 #redis 配置
-spring.redis.database=0
-spring.redis.host=172.16.10.85
+spring.redis.database=1
+spring.redis.host=172.16.11.20
 spring.redis.port=6379
-spring.redis.password=amos2019Redis
+spring.redis.password=1234560
 spring.redis.jedis.pool.max-active=200
 spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=10

amos-boot-system-tzs/src/main/resources/application-jd.properties

@@ -47,19 +47,19 @@ tzs.cti.secretkey=7bd29115-99ee-4f7d-1fb1-7c4719d5f43a
 tzs.cti.url=http://36.46.151.113:8000
 
 tzs.wechat.url=https://api.weixin.qq.com
-tzs.wechat.appid=wx79aca5bb1cb4af92
-tzs.wechat.secret=f3a12323ba731d282c3d4698c27c3e97
+tzs.wechat.appid=wx8918c1aaad956617
+tzs.wechat.secret=337c3d8f3e749140d4f9aedc8311033b
 
 ##wechatToken
 tzs.wechat.token=yeejoin_2021
 ##wechatTicketUrl
 tzs.wechat.ticketurl=https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=
 
-tzs.wechat.tempId.kr=bxchKYhYW7aHbGKM2pVyR_yY2-bG4sRMNU3ZRQbMKYM
+tzs.wechat.tempId.kr=rjW8x9rRitIpa21Jekyx2nzBzpJy7tycssCXSN4YhWw
 tzs.wechat.url.kr=tzs.yeeamos.com/persondetail.html
-tzs.wechat.tempId.wx=rags-expfNSBB-h2WenuBI2c6pCEndH4uwTtOqlHqDM
+tzs.wechat.tempId.wx=ofBIZS8Bup9s0zKbrGa8BfhVhS18H_hyC_OYXuBN6hI
 tzs.wechat.url.wx=tzs.yeeamos.com/repairPersondetail.html
-tzs.wechat.tempId.ts=rags-expfNSBB-h2WenuBI2c6pCEndH4uwTtOqlHqDM
+tzs.wechat.tempId.ts=Kr7lcV8g4g_lgyW_RpwnNgw_HDxxRuVx759EoFWrIfU
 tzs.wechat.url.ts=tzs.yeeamos.com/taskComplaintDetail.html
 
 mqtt.topic.task.newtask=tzs-task-newtask