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

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/EnterpriseInfoModel.java

@@ -22,6 +22,10 @@ public class EnterpriseInfoModel extends AbstractBaseModel {
 
     private static final long serialVersionUID = 1L;
 
+
+    private String superviseOrgCode;
+    private String superviseOrgName;
+
     private List businessLicense;
 
             @ApiModelProperty(value = "使用单位唯一标识")

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/EnterpriseInfo.java

@@ -29,6 +29,8 @@ public class EnterpriseInfo extends AbstractBaseEntity {
 
     private static final long serialVersionUID = 1L;
 
+    private String superviseOrgCode;
+    private String superviseOrgName;
 
     @ApiModelProperty(value = "使用单位唯一标识")
 

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzBaseEnterpriseInfoDto.java

 package com.yeejoin.amos.boot.module.tzs.api.dto;
 
-    import java.util.Date;
+import java.util.Date;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
-    import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-    import io.swagger.annotations.ApiModel;
-    import io.swagger.annotations.ApiModelProperty;
-    import lombok.Data;
 /**
-* 企业数据信息Dto
-*
-* @author duanwei
-* @date 2022-08-10
-*/
+ * 企业数据信息Dto
+ *
+ * @author duanwei
+ * @date 2022-07-26
+ */
 @Data
 public class TzBaseEnterpriseInfoDto extends BaseDto {
 
@@ -247,6 +248,4 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
     * 技术负责人
     */
     private String technicalPerson;
-
-
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzBaseEnterpriseInfo.java

@@ -22,8 +22,10 @@ import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@ApiModel(value="TzBaseEnterpriseInfo对象", description="企业数据信息")
-public class TzBaseEnterpriseInfo extends BaseEntity {
+@TableName("tz_jg_enterprise_info")
+@ApiModel(value="TzsJgEnterpriseInfo对象", description="企业数据信息")
+public class TzsJgEnterpriseInfo extends BaseEntity {
+
 
     private static final long serialVersionUID = 1L;
 
@@ -120,6 +122,9 @@ public class TzBaseEnterpriseInfo extends BaseEntity {
 
     @ApiModelProperty(value = "对接公司编码")
     private String appId;
+    
+    @ApiModelProperty(value = "单位类型")
+    private String unitType;
 
 
 

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzsJgConstructionInfo.java

@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@TableName("tzs_jg_construction_info")
+@TableName("tz_jg_construction_info")
 @ApiModel(value = "TzsJgConstructionInfo对象", description = "特种设备基本信息-施工信息")
 public class TzsJgConstructionInfo extends BaseEntity {
 

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzsJgDesignInfo.java

@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@TableName("tzs_jg_design_info")
+@TableName("tz_jg_design_info")
 @ApiModel(value="TzsJgDesignInfo对象", description="特种设备基本信息-设计信息")
 public class TzsJgDesignInfo extends BaseEntity {
 

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzsJgElevatorTechInfo.java

@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@TableName("tzs_jg_elevator_tech_info")
+@TableName("tz_jg_elevator_tech_info")
 @ApiModel(value="TzsJgElevatorTechInfo对象", description="电梯技术参数")
 public class TzsJgElevatorTechInfo extends BaseEntity {
 

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzsJgEnclosureInfo.java

@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@TableName("tzs_jg_enclosure_info")
+@TableName("tz_jg_enclosure_info")
 @ApiModel(value="TzsJgEnclosureInfo对象", description="特种设备附件资料信息")
 public class TzsJgEnclosureInfo extends BaseEntity {
 

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzsJgFile.java

@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("tzs_jg_file")
+@TableName("tz_jg_file")
 @ApiModel(value = "TzsJgFile对象", description = "附件表")
 public class TzsJgFile extends BaseEntity {
 

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzsJgInspectionInfo.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("tzs_jg_inspection_info")
+@TableName("tz_jg_inspection_info")
 @ApiModel(value="TzsJgInspectionInfo对象", description="特种设备检验信息")
 public class TzsJgInspectionInfo extends BaseEntity {
 

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzsJgMaintenanceInfo.java

@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@TableName("tzs_jg_maintenance_info")
+@TableName("tz_jg_maintenance_info")
 @ApiModel(value="TzsJgMaintenanceInfo对象", description="特种设备基本信息-维保备案信息")
 public class TzsJgMaintenanceInfo extends BaseEntity {
 

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzsJgOtherInfo.java

@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@TableName("tzs_jg_other_info")
+@TableName("tz_jg_other_info")
 @ApiModel(value="TzsJgOtherInfo对象", description="特种设备基本信息-其他信息")
 public class TzsJgOtherInfo extends BaseEntity {
 

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzsJgProduceInfo.java

@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@TableName("tzs_jg_produce_info")
+@TableName("tz_jg_produce_info")
 @ApiModel(value = "TzsJgProduceInfo对象", description = "特种设备基本信息-制造信息")
 public class TzsJgProduceInfo extends BaseEntity {
 

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzsJgRegistrationInfo.java

@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@TableName("tzs_jg_registration_info")
+@TableName("tz_jg_registration_info")
 @ApiModel(value="TzsJgRegistrationInfo对象", description="特种设备基本信息-注册登记信息 ")
 public class TzsJgRegistrationInfo extends BaseEntity {
 

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzsJgStaffBaseInfo.java

@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@TableName("tzs_jg_staff_base_info")
+@TableName("tz_jg_staff_base_info")
 @ApiModel(value="TzsJgStaffBaseInfo对象", description="人员数据信息-基本信息")
 public class TzsJgStaffBaseInfo extends BaseEntity {
 

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzsJgStaffQualifInfo.java

@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@TableName("tzs_jg_staff_qualif_info")
+@TableName("tz_jg_staff_qualif_info")
 @ApiModel(value = "TzsJgStaffQualifInfo对象", description = "人员数据信息-资质信息")
 public class TzsJgStaffQualifInfo extends BaseEntity {
 

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzsJgSuperviseInfo.java

@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@TableName("tzs_jg_supervise_info")
+@TableName("tz_jg_supervise_info")
 @ApiModel(value="TzsJgSuperviseInfo对象", description="特种设备基本信息-监督管理信息")
 public class TzsJgSuperviseInfo extends BaseEntity {
 

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzsJgUseInfo.java

@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("tzs_jg_use_info")
+@TableName("tz_jg_use_info")
 @ApiModel(value = "TzsJgUseInfo对象", description = "特种设备基本信息-使用信息")
 public class TzsJgUseInfo extends BaseEntity {
 

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/feign/IdxFeignService.java

 package com.yeejoin.amos.boot.module.tzs.flc.api.feign;
 
+import com.alibaba.fastjson.JSONObject;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.List;
+import java.util.Map;
 
 @FeignClient(value = "AMOS-IDX", path = "idx")
 public interface IdxFeignService {
 
     @RequestMapping("/dimensionTable/getTreeChildIds")
     ResponseModel<List<String>> getTreeChildIds(@RequestParam String dimensionTableId, @RequestParam String selectValue);
+
+    /**
+     * 查询表详情和表字段
+     *
+     * @param tableId
+     * @return
+     */
+    @RequestMapping(value = "/table/{tableId}", method = RequestMethod.GET)
+    ResponseModel<JSONObject> queryByTableId(@PathVariable String tableId);
 }

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.flc.api.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.BizRecordCount;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.IdxUjerDto;
 
@@ -13,9 +14,23 @@ public interface InspectionService {
 
     IPage<IdxUjerDto> bizDetailList(String dimensionTableId, String selectValue, String bizType, int current, int size);
 
+    /**
+     * 返回多个监察统计（list）
+     * @param bizRecordCountList
+     * @return
+     */
     List<Map<String, Object>> bizRecordCountByField(List<BizRecordCount> bizRecordCountList);
 
+    /**
+     * 返回单个监察统计（map）
+     * @param bizRecordCount
+     * @return
+     */
+    Map<String, Object> bizRecordCountByField(BizRecordCount bizRecordCount);
+
     JSONObject getSafetySupervisionCode(String bizTable);
 
     JSONObject getSafetySupervisionInfo();
+
+    Page<JSONObject> getMapByRegion(Long regionSeq, String tableId, String type);
 }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/AmosTzsApplication.java

 package com.yeejoin.amos;
-import com.yeejoin.amos.boot.biz.common.utils.oConvertUtils;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+import org.eclipse.paho.client.mqttv3.MqttException;
 import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -11,18 +16,22 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.typroject.tyboot.component.emq.EmqKeeper;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
+import com.yeejoin.amos.boot.biz.common.utils.oConvertUtils;
+import com.yeejoin.amos.boot.module.tzs.biz.listener.BaseEnterpriseMqTtlListener;
+import com.yeejoin.amos.boot.module.tzs.biz.listener.CarcylUnitInspectMqTtlListener;
+import com.yeejoin.amos.boot.module.tzs.biz.service.impl.StartPlatformTokenService;
 
 /**
  * <pre>
- *   特种设备服务启动类
+ * 特种设备服务启动类
  * </pre>
  *
  * @author DELL
@@ -36,26 +45,51 @@ import java.net.UnknownHostException;
 @EnableAsync
 @EnableEurekaClient
 @EnableScheduling
-@MapperScan({"org.typroject.tyboot.demo.face.orm.dao*",
-        "org.typroject.tyboot.face.*.orm.dao*",
-        "org.typroject.tyboot.core.auth.face.orm.dao*",
-        "org.typroject.tyboot.component.*.face.orm.dao*",
-        "com.yeejoin.amos.boot.module.**.api.mapper",
-        "com.yeejoin.amos.boot.biz.common.dao.mapper"})
-@ComponentScan(basePackages = {"org.typroject", "com.yeejoin.amos"})
+@MapperScan({ "org.typroject.tyboot.demo.face.orm.dao*", "org.typroject.tyboot.face.*.orm.dao*",
+		"org.typroject.tyboot.core.auth.face.orm.dao*", "org.typroject.tyboot.component.*.face.orm.dao*",
+		"com.yeejoin.amos.boot.module.**.api.mapper", "com.yeejoin.amos.boot.biz.common.dao.mapper" })
+@ComponentScan(basePackages = { "org.typroject", "com.yeejoin.amos" })
 public class AmosTzsApplication {
-    private static final Logger logger = LoggerFactory.getLogger(AmosTzsApplication.class);
-
-    public static void main(String[] args) throws UnknownHostException {
-        ConfigurableApplicationContext context = SpringApplication.run(AmosTzsApplication.class, args);
-        Environment env = context.getEnvironment();
-        String ip = InetAddress.getLocalHost().getHostAddress();
-        String port = env.getProperty("server.port");
-        String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
-
-        logger.info("\n----------------------------------------------------------\n\t" +
-                "Application Amos-Biz-Boot is running! Access URLs:\n\t" +
-                "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
-                "----------------------------------------------------------");
-    }
+	private static final Logger logger = LoggerFactory.getLogger(AmosTzsApplication.class);
+	@Autowired
+	private EmqKeeper emqKeeper;
+
+	@Autowired
+	private CarcylUnitInspectMqTtlListener carcylUnitInspectMqTtlListener;
+
+	@Autowired
+	private BaseEnterpriseMqTtlListener baseEnterpriseMqTtlListener;
+
+	@Autowired
+	private StartPlatformTokenService startPlatformTokenService;
+
+	public static void main(String[] args) throws UnknownHostException {
+		ConfigurableApplicationContext context = SpringApplication.run(AmosTzsApplication.class, args);
+		Environment env = context.getEnvironment();
+		String ip = InetAddress.getLocalHost().getHostAddress();
+		String port = env.getProperty("server.port");
+		String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
+
+		logger.info("\n----------------------------------------------------------\n\t"
+				+ "Application Amos-Biz-Boot is running! Access URLs:\n\t" + "Swagger文档: \thttp://" + ip + ":" + port
+				+ path + "/doc.html\n" + "----------------------------------------------------------");
+	}
+
+	/**
+	 * 初始化MQTT
+	 * 
+	 * @throws MqttException
+	 */
+	@Bean
+	public void initMqtt() throws MqttException {
+		emqKeeper.getMqttClient().subscribe("/idx/idx_biz_carcyl_unit_inspect", 1, carcylUnitInspectMqTtlListener);
+		emqKeeper.getMqttClient().subscribe("/tm/tz_base_enterprise_info", 1, baseEnterpriseMqTtlListener);
+//		emqKeeper.getMqttClient().subscribe("topic_mqtt_exam", 1, examMqTtlListener);
+//		emqKeeper.getMqttClient().subscribe("topic_mqtt_exam_record", 1, examMqTtRecordListener);
+	}
+
+	@Bean
+	public void initToken() {
+		startPlatformTokenService.getToken();
+	}
 }

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

@@ -70,6 +70,19 @@ public class InspectionController {
     }
 
     /**
+     * 生产、使用环节
+     *
+     * @param bizRecordCount
+     * @return
+     */
+    @PostMapping("/safetySupervisionForMap")
+    @ApiOperation(value = "安全监察统计")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    public ResponseModel<Map<String, Object>> safetySupervisionForMap(@RequestBody BizRecordCount bizRecordCount) {
+        return ResponseHelper.buildResponse(inspectionService.bizRecordCountByField(bizRecordCount));
+    }
+
+    /**
      * 生成安全监察指令书编号
      *
      * @param bizTable
@@ -112,4 +125,11 @@ public class InspectionController {
         Page result = Privilege.agencyUserClient.queryForPage(null, realName, mobile, null, current, size, ids).getResult();
         return ResponseHelper.buildResponse(result);
     }
+
+    @GetMapping("/getMapByRegion/{regionSeq}")
+    @ApiOperation(value = "获取下级行政区划下的所有数据")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    public ResponseModel<com.baomidou.mybatisplus.extension.plugins.pagination.Page> getMapByRegion(@PathVariable(value = "regionSeq") Long regionSeq, @RequestParam(value = "tableId") String tableId, @RequestParam(value = "type") String type) {
+        return ResponseHelper.buildResponse(inspectionService.getMapByRegion(regionSeq, tableId, type));
+    }
 }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/listener/BaseEnterpriseMqTtlListener.java

+package com.yeejoin.amos.boot.module.tzs.biz.listener;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.typroject.tyboot.component.emq.EmqxListener;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.tzs.biz.utils.DesUtil;
+import com.yeejoin.amos.boot.module.tzs.biz.utils.RedisUtil;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.ApplicationModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.privilege.model.RoleModel;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @Description: mqtt监听服务
+ * @Author: duanwei
+ * @Date: 2020/9/15
+ */
+@Component
+@Slf4j
+public class BaseEnterpriseMqTtlListener extends EmqxListener {
+	@Value("${amos.secret.key}")
+	String secretKey;
+
+	@Value("${admin.product}")
+	String product;
+
+	@Value("${admin.appkey}")
+	String appkey;
+	@Autowired
+	RedisUtil redisUtil;
+
+	@Override
+	public void processMessage(String topic, MqttMessage message) throws Exception {
+		System.out.println(message);
+		JSONObject object = null;
+		try {
+			object = JSONObject.parseObject(message.toString());
+		} catch (Exception e) {
+			throw new Exception("公司同步消息解析失败");
+		}
+		RequestContext.setAppKey(appkey);
+		RequestContext.setProduct(product);
+		RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
+		FeignClientResult<List<ApplicationModel>> aResult = Privilege.applicationClient.queryAgencyApplications();
+		List<ApplicationModel> aList = aResult.getResult();
+		List<String> appCodes = aList.stream().filter(i -> "监管端,企业端".indexOf(i.getAppName()) != -1)
+				.map(i -> i.getAppCode()).collect(Collectors.toList());
+		FeignClientResult<CompanyModel> cResult = Privilege.companyClient.seleteOne(object.getLong("sequence_nbr"));
+		if (cResult.getResult() == null) {
+			CompanyModel companyModel = new CompanyModel();
+			companyModel.setCompanyName(object.getString("use_unit"));
+			companyModel.setParentId(0L);
+			companyModel.setLevel("company");
+			companyModel.setSequenceNbr(object.getLong("sequence_nbr"));
+			companyModel.setCompanyCode(object.getString("use_code"));
+			FeignClientResult<HashMap<String,Object>>  result= Privilege.companyClient.queryByOrgcode(object.getString("supervise_org_code"));
+			//JSONObject parent = JSONObject.parseObject(JSONObject.toJSONString(result.getResult()));
+			if(result.getResult().get("sequenceNbr")!=null) 
+			{
+				companyModel.setParentId(Long.valueOf(result.getResult().get("sequenceNbr").toString()));
+			}
+			Privilege.companyClient.create(companyModel);
+		}
+
+		String unitCode = object.getString("use_code");
+		if (unitCode == null || unitCode.length() < 6) {
+			log.error("公司统一信用代码长度不够6位");
+			throw new Exception("公司统一信用代码长度不够6位");
+		}
+		String userName = unitCode.substring(unitCode.length() - 6, unitCode.length());
+		FeignClientResult<AgencyUserModel> uResult = Privilege.agencyUserClient.queryByUserName(userName);
+		if (uResult.getResult() == null) {
+			AgencyUserModel userModel = new AgencyUserModel();
+			userModel.setUserName(userName);
+			userModel.setRealName(userName);
+			userModel.setPassword(DesUtil.encode(userName, secretKey));
+			userModel.setRePassword(DesUtil.encode(userName, secretKey));
+			// userModel.setMobile(vo.getPhoneNo());
+			userModel.setLockStatus("UNLOCK");
+			FeignClientResult<List<RoleModel>> list = Privilege.roleClient.queryRoleList("使用单位", "admin");
+			Map<Long, List<Long>> orgRoles = new HashMap<>();
+			List<Long> roleIds = new ArrayList<>();
+			roleIds.add(list.getResult().get(0).getSequenceNbr());
+			orgRoles.put(object.getLong("sequence_nbr"), roleIds);
+			userModel.setAppCodes(appCodes);
+			userModel.setOrgRoleSeqs(orgRoles);
+			Privilege.agencyUserClient.create(userModel);
+		}
+	}
+}

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/listener/CarcylUnitInspectMqTtlListener.java

+package com.yeejoin.amos.boot.module.tzs.biz.listener;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.typroject.tyboot.component.emq.EmqxListener;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.exception.BaseException;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.tzs.biz.utils.DesUtil;
+import com.yeejoin.amos.boot.module.tzs.biz.utils.RedisUtil;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.ApplicationModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.privilege.model.RoleModel;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @Description: mqtt监听服务
+ * @Author: duanwei
+ * @Date: 2020/9/15
+ */
+@Component
+@Slf4j
+public class CarcylUnitInspectMqTtlListener extends EmqxListener {
+	@Value("${amos.secret.key}")
+	String secretKey;
+
+	@Value("${admin.product}")
+	String product;
+
+	@Value("${admin.appkey}")
+	String appkey;
+	@Autowired
+	RedisUtil redisUtil;
+
+	@Override 
+	public void processMessage(String topic, MqttMessage message) throws Exception {
+		System.out.println(message);
+		JSONObject object = null;
+		try {
+			object = JSONObject.parseObject(message.toString());
+		} catch (Exception e) {
+			throw new Exception("公司同步消息解析失败");
+		}
+		RequestContext.setAppKey(appkey);
+		RequestContext.setProduct(product);
+		RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
+		FeignClientResult<List<ApplicationModel>> aResult = Privilege.applicationClient.queryAgencyApplications();
+		List<ApplicationModel> aList = aResult.getResult();
+		List<String> appCodes = aList.stream().filter(i -> "监管端,企业端".indexOf(i.getAppName()) != -1)
+				.map(i -> i.getAppCode()).collect(Collectors.toList());
+        String uuid = object.getString("id");
+        Long id = Long.valueOf(uuid.replaceAll("-","").hashCode());
+        
+		FeignClientResult<CompanyModel> cResult = Privilege.companyClient.seleteOne(id);
+		if (cResult.getResult() == null) {
+			CompanyModel companyModel = new CompanyModel();
+			companyModel.setCompanyName(object.getString("inspect_unit_name"));
+			companyModel.setParentId(0L);
+			companyModel.setLevel("company");
+			companyModel.setSequenceNbr(id);
+			companyModel.setCompanyCode(object.getString("org_unit_name"));
+			Privilege.companyClient.create(companyModel);
+		}
+
+		String unitCode = object.getString("org_unit_name");
+		if (unitCode == null || unitCode.length() < 6) {
+			log.error("公司统一信用代码长度不够6位");
+			throw new Exception("公司统一信用代码长度不够6位");
+		}
+		String userName = unitCode.substring(unitCode.length() - 6, unitCode.length());
+		FeignClientResult<AgencyUserModel> uResult = Privilege.agencyUserClient.queryByUserName(userName);
+		if (uResult.getResult() == null) {
+			AgencyUserModel userModel = new AgencyUserModel();
+			userModel.setUserName(userName);
+			userModel.setRealName(userName);
+			userModel.setPassword(DesUtil.encode(userName, secretKey));
+			userModel.setRePassword(DesUtil.encode(userName, secretKey));
+			// userModel.setMobile(vo.getPhoneNo());
+			userModel.setLockStatus("UNLOCK");
+			FeignClientResult<List<RoleModel>> list = Privilege.roleClient.queryRoleList("检验单位", "admin");
+			Map<Long, List<Long>> orgRoles = new HashMap<>();
+			List<Long> roleIds = new ArrayList<>();
+			roleIds.add(list.getResult().get(0).getSequenceNbr());
+			orgRoles.put(id, roleIds);
+			userModel.setAppCodes(appCodes);
+			userModel.setOrgRoleSeqs(orgRoles);
+			Privilege.agencyUserClient.create(userModel);
+		}
+	}
+}

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/InspectionServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.JsonValueUtils;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.IdxUjerMapper;
+import com.yeejoin.amos.boot.module.tzs.biz.utils.StringUtils;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.BizRecordCount;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.IdxUjerDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.feign.IdxFeignService;
@@ -24,6 +25,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.*;
 
@@ -51,7 +53,7 @@ public class InspectionServiceImpl implements InspectionService {
         List<String> companyIds = idxFeignService.getTreeChildIds(dimensionTableId, selectValue).getResult();
         Collection<CompanyModel> companyModels = Privilege.companyClient.companyTreeWithoutAuth().getResult();
         Map<String, String> companyMap = new HashMap<>();
-        convertCompanyTreeToMap(companyModels, null,companyMap);
+        convertCompanyTreeToMap(companyModels, null, companyMap);
         IPage<IdxUjerDto> idxUjerPage = new Page<>(current, size);
         IPage<IdxUjerDto> page = idxUjerMapper.getPage(idxUjerPage, companyIds, bizType);
         List<IdxUjerDto> records = page.getRecords();
@@ -87,39 +89,42 @@ public class InspectionServiceImpl implements InspectionService {
     public List<Map<String, Object>> bizRecordCountByField(List<BizRecordCount> bizRecordCountList) {
         List<Map<String, Object>> result = new ArrayList<>();
         for (BizRecordCount requestData : bizRecordCountList) {
-            Map map = JSONObject.parseObject(JSONObject.toJSONString(requestData), Map.class);
-            StrSubstitutor ss = new StrSubstitutor(map);
-
-            String selectSql = "SELECT ";
-            if (!ValidationUtil.isEmpty(requestData.getBizRecordItems())) {
-                requestData.setExpression(buildBizRecordItems(requestData.getBizRecordItems()));
-            }
-
-            if (!ValidationUtil.isEmpty(requestData.getExpression())) {
-                selectSql += requestData.getExpression() + " as count";
-            } else {
-                selectSql += "COUNT(*) count";
-            }
-
-            if (!ValidationUtil.isEmpty(requestData.getTableName())) {
-                selectSql = selectSql + " FROM ${tableName}";
-            }
-
-            if (!ValidationUtil.isEmpty(requestData.getFieldKey())) {
-                selectSql = selectSql + (selectSql.contains("WHERE") ? " AND" : " WHERE") + " ${fieldKey}='${fieldValue}'";
-            }
-            selectSql = ss.replace(selectSql);
-            Map<String, Object> queryResult = bizJdbcTemplate.queryForMap(selectSql);
-
-            HashMap<String, Object> item = new HashMap<>();
-            item.put("key", requestData.getTitle());
-            item.put("value", queryResult.get("count"));
+            Map<String, Object> item = bizRecordCountByField(requestData);
             result.add(item);
         }
         return result;
     }
 
     @Override
+    public Map<String, Object> bizRecordCountByField(BizRecordCount bizRecordCount) {
+        Map map = JSONObject.parseObject(JSONObject.toJSONString(bizRecordCount), Map.class);
+        StrSubstitutor ss = new StrSubstitutor(map);
+
+        String selectSql = "SELECT ";
+        if (!ValidationUtil.isEmpty(bizRecordCount.getBizRecordItems())) {
+            bizRecordCount.setExpression(buildBizRecordItems(bizRecordCount.getBizRecordItems()));
+        }
+        if (!ValidationUtil.isEmpty(bizRecordCount.getExpression())) {
+            selectSql += bizRecordCount.getExpression() + " as count";
+        } else {
+            selectSql += "COUNT(*) count";
+        }
+        if (!ValidationUtil.isEmpty(bizRecordCount.getTableName())) {
+            selectSql = selectSql + " FROM ${tableName}";
+        }
+        if (!ValidationUtil.isEmpty(bizRecordCount.getFieldKey())) {
+            selectSql = selectSql + (selectSql.contains("WHERE") ? " AND" : " WHERE") + " ${fieldKey}='${fieldValue}'";
+        }
+        selectSql = ss.replace(selectSql);
+        Map<String, Object> queryResult = bizJdbcTemplate.queryForMap(selectSql);
+
+        HashMap<String, Object> item = new HashMap<>();
+        item.put("key", bizRecordCount.getTitle());
+        item.put("value", queryResult.get("count"));
+        return item;
+    }
+
+    @Override
     public JSONObject getSafetySupervisionCode(String bizTable) {
         String safetySupervisionCode = "（%s）市监特令中[%s]第  %s 号";
         AgencyUserModel agencyUserModel = Privilege.agencyUserClient.getme().getResult();
@@ -166,6 +171,37 @@ public class InspectionServiceImpl implements InspectionService {
         return jsonObject;
     }
 
+    @Override
+    public Page<JSONObject> getMapByRegion(Long regionSeq, String tableId, String type) {
+        Page<JSONObject> page = new Page<>(1, 10);
+        Collection<RegionModel> result = Systemctl.regionClient.queryByParentId(regionSeq).getResult();
+        JSONObject tableMap = idxFeignService.queryByTableId(tableId).getResult();
+        String tableName = tableMap.getString("tableName");
+        JSONArray tableCols = tableMap.getJSONArray("tableCols");
+        Map<String, String> columMap = new HashMap<>();
+        tableCols.forEach(x -> {
+            Map<String, String> obj = (Map) x;
+            if (!"type".equals(obj.get("columnName"))) {
+                columMap.put(obj.get("name"), obj.get("columnName"));
+            }
+        });
+        JSONObject jsonObject = new JSONObject();
+        String selectSql = "SELECT * FROM " + tableName + " WHERE type=" + StringUtils.str2sqlValue(type);
+        Map<String, Object> objectMap = bizJdbcTemplate.queryForMap(selectSql);
+        result.forEach(x -> {
+            String regionName = columMap.get(x.getRegionName());
+            jsonObject.put(regionName, objectMap.get(regionName));
+        });
+
+        if (!ValidationUtil.isEmpty(jsonObject)){
+            page.setTotal(1);
+            List<JSONObject> list = new ArrayList();
+            list.add(jsonObject);
+            page.setRecords(list);
+        }
+        return page;
+    }
+
     private String buildBizRecordItems(List<BizRecordCount.BizRecordItem> bizRecordItems) {
         String sql = "";
         for (BizRecordCount.BizRecordItem item : bizRecordItems) {

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/StartPlatformTokenService.java

+package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+
+import com.yeejoin.amos.boot.module.tzs.biz.utils.DesUtil;
+import com.yeejoin.amos.boot.module.tzs.biz.utils.RedisUtil;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
+
+@Service
+public class StartPlatformTokenService {
+
+	@Value("${admin.product}")
+	String product;
+
+	@Value("${admin.appkey}")
+	String appkey;
+
+	@Value("${admin.user}")
+	String user;
+
+	@Value("${admin.password}")
+	String password;
+
+	@Value("${amos.secret.key}")
+	String secretKey;
+
+	@Autowired
+	RedisUtil redisUtil;
+	
+
+	public void getToken() {
+		RequestContext.setProduct(product);
+		RequestContext.setAppKey(appkey);
+		IdPasswordAuthModel authModel = new IdPasswordAuthModel();
+		authModel.setLoginId(user);
+		authModel.setPassword(DesUtil.encode(password, secretKey));
+		System.out.println("user:" + user);
+		System.out.println("secretKey:" + secretKey);
+		FeignClientResult<Map<String, String>> authResult = Privilege.authClient.idpassword(authModel);
+		String token = authResult.getResult().get("token");
+		System.out.println("token:" + token);
+		RequestContext.setToken(token);
+		redisUtil.set("platform_token", token);
+	}
+}

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/utils/StringUtils.java

+package com.yeejoin.amos.boot.module.tzs.biz.utils;
+
+import java.util.Map;
+import java.util.StringJoiner;
+
+/**
+ * @Author: xl
+ * @Description:
+ * @Date: 2022/8/4 9:08
+ */
+public class StringUtils {
+
+    public static StringJoiner getWhereSql(String operator, Map<String, String> map){
+        StringJoiner stringJoiner = new StringJoiner(" " + operator +" ");
+        for (Map.Entry entry :map.entrySet()) {
+            stringJoiner.add(entry.getKey() + "=" + str2sqlValue(entry.getValue().toString()));
+        }
+        return stringJoiner;
+    }
+
+    public static String str2sqlValue(String str){
+        return "'" + str + "'";
+    }
+}