Merge branch 'developer' into 'develop_unit_register'

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

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import lombok.Data;
+
+@Data
+public class EquEnterDto {
+
+    /**
+     * 设备id
+     */
+    private String sequenceNbr;
+    /**
+     * 使用登记代码
+     */
+    private String useOrgCode;
+
+    /**
+     * 设备类别
+     */
+    private String equCategory;
+
+    /**
+     * 设备名称
+     */
+    private String productName;
+
+    /**
+     * 设备位置
+     */
+    private String address;
+}

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

 package com.yeejoin.amos.boot.module.tzs.api.entity;
 
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,7 +23,8 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@ApiModel(value = "TzBaseEnterpriseInfo对象", description = "企业数据信息")
+@TableName("tz_base_enterprise_info")
+@ApiModel(value="TzBaseEnterpriseInfo对象", description="企业数据信息")
 public class TzBaseEnterpriseInfo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/TzBaseEnterpriseInfoMapper.java

 package com.yeejoin.amos.boot.module.tzs.api.mapper;
 
+import com.yeejoin.amos.boot.module.tzs.api.dto.EquEnterDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgBasicInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.List;
 
 /**
  * 企业数据信息 Mapper 接口
@@ -11,4 +19,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseInfo> {
 
+	/**
+	 * 查找企业关联设备详情列表
+	 * 
+	 * @param sequenceNbr 企业id
+	 * @return EquEnterDto 使用登记证代码、设备名称、设备类别、设备位置
+	 */
+	List<EquEnterDto> getInfo(String sequenceNbr);
+
+	IPage<TzBaseEnterpriseInfoDto> page(Page<TzBaseEnterpriseInfoDto> page, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto);
 }

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

 package com.yeejoin.amos.boot.module.tzs.api.service;
 
-import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.tzs.api.dto.EquEnterDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
+import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
 
 /**
  * 企业数据信息 服务类
@@ -11,4 +17,15 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITzBaseEnterpriseInfoService extends IService<TzBaseEnterpriseInfo> {
 
+	/**
+	 * 查找企业关联设备详情列表
+	 * 
+	 * @param sequenceNbr 企业id
+	 * @return EquEnterDto 使用登记证代码、设备名称、设备类别、设备位置
+	 */
+	List<EquEnterDto> getInfo(String sequenceNbr);
+
+	IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto);
+
+	TzBaseEnterpriseInfoDto detail(Long id);
 }

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

@@ -5,6 +5,8 @@ import lombok.Data;
 @Data
 public class IdxUjerDto {
     private String businessName;
+    private String creditCode;
+    private String businessType;
     private byte[] businessAddress;
     private String businessAddressStr;
     private String contacts;

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

@@ -27,7 +27,7 @@ public class TzCarcylRegDto {
     /**
     * id
     */
-    private Long sequenceNbr;
+    private String sequenceNbr;
             @ApiModelProperty(value = "使用单位名称")
     /**
     * 使用单位名称

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.precontrol.common.mapper.TzBaseEnterpriseInfoMapper">
+<mapper
+	namespace="com.yeejoin.amos.boot.module.tzs.api.mapper.TzBaseEnterpriseInfoMapper">
+
+	<select id="getInfo"
+		resultType="com.yeejoin.amos.boot.module.tzs.api.dto.EquEnterDto">
+		SELECT
+		RI.sequence_nbr,
+		RI.use_org_code,
+		RI.equ_category,
+		RI.product_name,
+		UI.address
+		FROM
+		tz_jg_registration_info AS RI
+		LEFT JOIN tz_jg_use_info UI ON RI.sequence_code = UI.sequence_code
+		LEFT JOIN tz_base_enterprise_info EI ON EI.sequence_nbr = #{sequenceNbr}
+		WHERE
+		EI.use_code = RI.organization_code
+	</select>
+
+	<select id="page"
+		resultType="com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto">
+		SELECT
+		*,
+		CONCAT(province,"/",city,"/",district) AS region,
+		CONCAT(street,"/",address) AS full_address
+		FROM
+		tz_base_enterprise_info
+		<where>
+			<if
+				test="tzBaseEnterpriseInfoDto.unitType!=null and tzBaseEnterpriseInfoDto.unitType!='' ">
+				AND unit_type = #{tzBaseEnterpriseInfoDto.unitType}
+			</if>
+			<if
+				test="tzBaseEnterpriseInfoDto.useUnit!=null and tzBaseEnterpriseInfoDto.useUnit!='' ">
+				AND use_unit LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.useUnit},'%') 
+			</if>
+			<if
+				test="tzBaseEnterpriseInfoDto.useUnitCertificate!=null and tzBaseEnterpriseInfoDto.useUnitCertificate!='' ">
+				AND use_unit_certificate = #{tzBaseEnterpriseInfoDto.useUnitCertificate}
+			</if>
+			<if
+				test="tzBaseEnterpriseInfoDto.useCode!=null and tzBaseEnterpriseInfoDto.useCode!='' ">
+				AND use_code LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.useCode},'%') 
+			</if>
+			<if
+				test="tzBaseEnterpriseInfoDto.superviseOrgCode!=null and tzBaseEnterpriseInfoDto.superviseOrgCode!='' ">
+				AND supervise_org_code LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.superviseOrgCode},'%') 
+			</if>
+			<if
+				test="tzBaseEnterpriseInfoDto.region!=null and tzBaseEnterpriseInfoDto.region!='' ">
+				AND CONCAT(province,"/",city,"/",district) LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.region},'%') 
+			</if>
+			<if
+				test="tzBaseEnterpriseInfoDto.legalPerson!=null and tzBaseEnterpriseInfoDto.legalPerson!='' ">
+				AND legal_person LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.legalPerson},'%') 
+			</if>
+			<if
+				test="tzBaseEnterpriseInfoDto.legalPhone!=null and tzBaseEnterpriseInfoDto.legalPhone!='' ">
+				AND legal_phone LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.legalPhone},'%') 
+			</if>
+			AND is_delete = 0
+		</where>
+	</select>
 
 </mapper>

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

@@ -19,19 +19,22 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import org.apache.commons.lang.text.StrSubstitutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 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.*;
 
 @Service
 public class InspectionServiceImpl implements InspectionService {
 
+    private final Logger log = LoggerFactory.getLogger(InspectionServiceImpl.class);
+
     @Autowired
     JdbcTemplate jdbcTemplate;
 
@@ -116,8 +119,9 @@ public class InspectionServiceImpl implements InspectionService {
             selectSql = selectSql + (selectSql.contains("WHERE") ? " AND" : " WHERE") + " ${fieldKey}='${fieldValue}'";
         }
         selectSql = ss.replace(selectSql);
-        Map<String, Object> queryResult = bizJdbcTemplate.queryForMap(selectSql);
 
+        Map<String, Object> queryResult = bizJdbcTemplate.queryForMap(selectSql);
+        log.info("查询sql：" + selectSql);
         HashMap<String, Object> item = new HashMap<>();
         item.put("key", bizRecordCount.getTitle());
         item.put("value", queryResult.get("count"));
@@ -209,7 +213,7 @@ public class InspectionServiceImpl implements InspectionService {
             for (int i = 1; i <= item.getColumnIndex(); i++) {
                 whereSql.add(String.format("%s%s='%s'", item.getColumnPrefix(), i, item.getColumnValue()));
             }
-            sql = ValidationUtil.isEmpty(sql) ? "" : "+" + String.format("(SELECT count(*) FROM %s WHERE %s)", item.getTableName(), whereSql);
+            sql = sql + ((ValidationUtil.isEmpty(sql) ? "" : "+") + String.format("(SELECT count(*) FROM %s WHERE %s)", item.getTableName(), whereSql));
         }
         return sql;
     }

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

 package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
+import com.yeejoin.amos.boot.module.tzs.api.dto.EquEnterDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgBasicInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import liquibase.pro.packaged.L;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import java.util.List;
+
 /**
  * 企业数据信息 服务实现类
  *
@@ -17,4 +26,23 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 @Service
 public class TzBaseEnterpriseInfoServiceImpl extends BaseService<TzBaseEnterpriseInfoDto, TzBaseEnterpriseInfo, TzBaseEnterpriseInfoMapper> implements ITzBaseEnterpriseInfoService {
 
+    @Autowired
+    private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
+
+    @Override
+    public List<EquEnterDto> getInfo(String sequenceNbr) {
+        return tzBaseEnterpriseInfoMapper.getInfo(sequenceNbr);
+    }
+
+	@Override
+	public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto) {
+		Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+		return this.baseMapper.page(page, tzBaseEnterpriseInfoDto);
+	}
+
+	@Override
+	public TzBaseEnterpriseInfoDto detail(Long id) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/logback-dev2.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <property name="LOG_HOME" value="log" />
+    <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+    <property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %-50.50logger{50} - %msg [%file:%line] %n" />
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/tzs.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+            <!--日志文件大小-->
+            <MaxFileSize>30mb</MaxFileSize>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>${LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+    <!-- 控制台输出 -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>${LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+    <!--    show parameters for hibernate sql 专为 Hibernate 定制
+    <logger name="org.hibernate.type.descriptor.sql.BasicBinder"  level="TRACE" />
+    <logger name="org.hibernate.type.descriptor.sql.BasicExtractor"  level="DEBUG" />
+    <logger name="org.hibernate.SQL" level="DEBUG" />
+    <logger name="org.hibernate.engine.QueryParameters" level="DEBUG" />
+    <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
+    -->
+    <!--myibatis log configure-->
+    <logger name="com.apache.ibatis" level="INFO"/>
+    <logger name="org.mybatis" level="INFO" />
+    <logger name="java.sql.Connection" level="INFO"/>
+    <logger name="java.sql.Statement" level="INFO"/>
+    <logger name="java.sql.PreparedStatement" level="INFO"/>
+    <logger name="org.springframework" level="INFO"/>
+
+    <logger name="com.baomidou.mybatisplus" level="INFO"/>
+    <logger name="org.apache.activemq" level="INFO"/>
+    <logger name="org.typroject" level="INFO"/>
+    <logger name="com.yeejoin" level="INFO"/>
+
+    <!-- 日志输出级别 -->
+    <root level="DEBUG">
+    <!-- <appender-ref ref="FILE" /> -->
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file