Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgUsrFormDto.java

@@ -98,7 +98,8 @@ public class OrgUsrFormDto implements Serializable {
 			  dynamicFormAlert.forEach(formValue->{
 				    if("select".equals(formValue.getType())){
                         this.map.put(formValue.getKey(), formValue.getValueName());
-
+                    }else if("是否重点单位".equals(formValue.getLabel())){    //对此字段做特殊处理 方便前端展示
+                        this.map.put(formValue.getKey(), formValue.getValueName());
                   }else{
                         this.map.put(formValue.getKey(), formValue.getValue());
 

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

@@ -333,13 +333,15 @@
         a.companyMaleEmployees,
         a.companyFemaleEmployees,
         a.managementType,
+        a. keySiteCompany as  isKeyPoint
+        FROM
         Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance,
         case when cks_d.count is null then  0 else cks_d.count end as keySiteNum
         FROM important_companys a left join (
            SELECT cks.belong_id ,count(cks.belong_id) count from cb_key_site cks   where cks.is_delete=0    GROUP BY cks.belong_id
         )cks_d
  		on a.id=cks_d.belong_id
-        where     a.longitude is not null and a.latitude is not null
+        where     a.longitude is not null and a.latitude is not null and a.keySiteCompany = 1
         <if test='par.distance!=null'>
             and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;=
             #{par.distance}

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

@@ -109,19 +109,20 @@ public class EquipmentIotMqttReceiveConfig {
         iSyncDataService.saveOrUpdateEquipIotCodeRedisData(equipAndCars);
         List<String> list = new ArrayList<String>();
         if (equipAndCars.size() > 0) {
-            for (EquipmentSpecificVo specificVo : equipAndCars) {
-                String iotCode = specificVo.getIotCode();
-                if (iotCode.length() > 8) {
-                    String prefix = iotCode.substring(0, 8);
-                    String suffix = iotCode.substring(8);
-                    String topicTotal = String.format("%s/%s/property", prefix, suffix);
-                    list.add(topicTotal);
-                }
-            }
+//            for (EquipmentSpecificVo specificVo : equipAndCars) {
+//                String iotCode = specificVo.getIotCode();
+//                if (iotCode.length() > 8) {
+//                    String prefix = iotCode.substring(0, 8);
+//                    String suffix = iotCode.substring(8);
+//                    String topicTotal = String.format("%s/%s/property", prefix, suffix);
+//                    list.add(topicTotal);
+//                }
+//            }
         } else {
             list.add(defaultTopic);
         }
         list.addAll(ConfigPageTopicEnum.getEnumTopicList());          //大屏数据推送接口订阅
+        list.add("+/+/property"); // 添加iot車輛裝備數據上報事件监听
         list.add("+/+/event"); // 添加iot事件监听
         String[] arr = list.toArray(new String[list.size()]);
         adapter = new MqttPahoMessageDrivenChannelAdapter(clientId + "_inbound", mqttPahoClientFactory(), arr);

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

@@ -2875,5 +2875,19 @@
     </changeSet>
 
 
+    <changeSet author="chenzhao" id="2022-04-25-1">
+        <preConditions onFail="MARK_RAN">
+            <viewExists viewName="important_companys"/>
+        </preConditions>
+        <dropView viewName="important_companys"/>
+        <comment>delete important_companys</comment>
+    </changeSet>
+
+    <changeSet author="chenzhao" id="2022-04-25-2">
+        <createView  viewName="important_companys" replaceIfExists="true" >
+            (select `a`.`name` AS `name`,`b`.`ids` AS `id`,`b`.`companyMaleEmployees` AS `companyMaleEmployees`,`b`.`companyFemaleEmployees` AS `companyFemaleEmployees`,`b`.`longitude` AS `longitude`,`b`.`latitude` AS `latitude`,`b`.`managementType` AS `managementType`,`b`.`keySiteCompany` AS `keySiteCompany` from (((select  `cb_org_usr`.`sequence_nbr` AS `id`, `cb_org_usr`.`biz_org_name` AS `name` from  `cb_org_usr` where (( `cb_org_usr`.`biz_org_type` in ('COMPANY','DEPARTMENT')) and ( `cb_org_usr`.`is_delete` = 0)))) `a` left join (select `v`.`instance_id` AS `ids`,max((case `v`.`field_code` when 'companyMaleEmployees' then `v`.`field_value` end)) AS `companyMaleEmployees`,max((case `v`.`field_code` when 'companyFemaleEmployees' then `v`.`field_value` end)) AS `companyFemaleEmployees`,max((case `v`.`field_code` when 'longitude' then `v`.`field_value` end)) AS `longitude`,max((case `v`.`field_code` when 'latitude' then `v`.`field_value` end)) AS `latitude`,max((case `v`.`field_code` when 'companyNature' then `v`.`field_value_label` end)) AS `managementType`,max((case `v`.`field_code` when 'businessCategory' then `v`.`field_value` end)) AS `keySiteCompany` from  `cb_dynamic_form_instance` `v` group by `v`.`instance_id`) `b` on((`b`.`ids` = `a`.`id`))))</createView>
+    </changeSet>
+
+
 </databaseChangeLog>