添加设备查询

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/EquipmentController.java

+package com.yeejoin.amos.api.openapi.controller;
+
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.api.openapi.face.model.EquipmentModel;
+import com.yeejoin.amos.api.openapi.face.orm.entity.PageParam;
+import com.yeejoin.amos.api.openapi.face.service.EquipmentService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 特种设备监管controller
+ */
+@RestController
+@Api(tags = "设备Api")
+@RequestMapping(value = "/equipment")
+public class EquipmentController {
+
+	@Autowired
+	EquipmentService iEquipmentService;
+
+	/**
+	 * 查询监管设备列表
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = true)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET", value = "查询监管设备列表", notes = "查询监管设备列表")
+	public ResponseModel<IPage<EquipmentModel>> page(PageParam pageParam,
+			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
+			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime) {
+		return ResponseHelper.buildResponse(iEquipmentService.page(pageParam, startTime, endTime));
+	}
+
+}

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

+package com.yeejoin.amos.api.openapi.face.model;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class EquipmentModel {
+	
+	@ApiModelProperty(value = "设备唯一标识码")
+	private Long sequenceNbr;
+	@ApiModelProperty(value = "使用登记证编号")
+	private String useRegistrationNumber;
+	@ApiModelProperty(value = "使用单位名称")
+	private String useUnit;
+
+	@ApiModelProperty(value = "设备种类")
+	private String equipmentType;
+
+	@ApiModelProperty(value = "设备类别")
+	private String equipmentCategory;
+
+	@ApiModelProperty(value = "设备品种")
+	private String equipmentVariety;
+
+	@ApiModelProperty(value = "产品名称")
+	private String equipmentName;
+
+	@ApiModelProperty(value = "设备代码")
+	private String equipmentCode;
+
+	@ApiModelProperty(value = "产品编号")
+	private String equipmentNumber;
+
+	@ApiModelProperty(value = "单位内编号")
+	private String internalNumber;
+
+	@ApiModelProperty(value = "登记机关")
+	private String registrationOrgan;
+
+	@ApiModelProperty(value = "发证日期")
+	private String registrationDate;
+
+	@ApiModelProperty(value = "设备使用地点/使用单位地址")
+	private String useUnitAddress;
+
+	@ApiModelProperty(value = "使用单位统一社会信用代码")
+	private String useUnitCode;
+
+	@ApiModelProperty(value = "使用代为所在地代码")
+	private String useUnitAreaCode;
+
+	@ApiModelProperty(value = "设备使用状态")
+	private String regStatus;
+
+	@ApiModelProperty(value = "设备使用状态变更日期")
+	private Date useStatusUpdate;
+
+	@ApiModelProperty(value = "变更登记")
+	private String changeStatus;
+	
+	@ApiModelProperty(value = "变更登记日期")
+	private Date changeUpdate;
+	
+	@ApiModelProperty(value = "投入使用日期")
+	private Date useDate;
+	
+	@ApiModelProperty(value = "设计单位名称")
+	private String designUnitName;
+	
+	@ApiModelProperty(value = "制造单位名称")
+	private String manUnitName;
+	
+	@ApiModelProperty(value = "施工单位名称")
+	private String builderUnitName;
+	
+	@ApiModelProperty(value = "监督检验机构名称")
+	private String JDUnitName;
+	@ApiModelProperty(value = "形式试验机构名称")
+	private String XSUnitName;
+	@ApiModelProperty(value = "产权单位名称")
+	private String CQUnitName;
+	@ApiModelProperty(value = "产权单位统一社会信用代码")
+	private String CQUnitCode;
+	@ApiModelProperty(value = "生产时间")
+	private Date recordDate;
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/EquipmentMapper.java

+package com.yeejoin.amos.api.openapi.face.orm.dao;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.api.openapi.face.model.EquipmentModel;
+import com.yeejoin.amos.api.openapi.face.orm.entity.Equipment;
+
+public interface EquipmentMapper  extends BaseMapper<Equipment> {
+
+	IPage<EquipmentModel> page(Page<EquipmentModel> page, Date startTime,Date endTime);
+
+}

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

+package com.yeejoin.amos.api.openapi.face.orm.entity;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class Equipment {
+	
+	@ApiModelProperty(value = "设备唯一标识码")
+	private Long sequenceNbr;
+	@ApiModelProperty(value = "使用登记证编号")
+	private String useRegistrationNumber;
+	@ApiModelProperty(value = "使用单位名称")
+	private String useUnit;
+
+	@ApiModelProperty(value = "设备种类")
+	private String equipmentType;
+
+	@ApiModelProperty(value = "设备类别")
+	private String equipmentCategory;
+
+	@ApiModelProperty(value = "设备品种")
+	private String equipmentVariety;
+
+	@ApiModelProperty(value = "产品名称")
+	private String equipmentName;
+
+	@ApiModelProperty(value = "设备代码")
+	private String equipmentCode;
+
+	@ApiModelProperty(value = "产品编号")
+	private String equipmentNumber;
+
+	@ApiModelProperty(value = "单位内编号")
+	private String internalNumber;
+
+	@ApiModelProperty(value = "登记机关")
+	private String registrationOrgan;
+
+	@ApiModelProperty(value = "发证日期")
+	private String registrationDate;
+
+	@ApiModelProperty(value = "设备使用地点/使用单位地址")
+	private String useUnitAddress;
+
+	@ApiModelProperty(value = "使用单位统一社会信用代码")
+	private String useUnitCode;
+
+	@ApiModelProperty(value = "使用代为所在地代码")
+	private String useUnitAreaCode;
+
+	@ApiModelProperty(value = "设备使用状态")
+	private String regStatus;
+
+	@ApiModelProperty(value = "设备使用状态变更日期")
+	private Date useStatusUpdate;
+
+	@ApiModelProperty(value = "变更登记")
+	private String changeStatus;
+	
+	@ApiModelProperty(value = "变更登记日期")
+	private Date changeUpdate;
+	
+	@ApiModelProperty(value = "投入使用日期")
+	private Date useDate;
+	
+	@ApiModelProperty(value = "设计单位名称")
+	private String designUnitName;
+	
+	@ApiModelProperty(value = "制造单位名称")
+	private String manUnitName;
+	
+	@ApiModelProperty(value = "施工单位名称")
+	private String builderUnitName;
+	
+	@ApiModelProperty(value = "监督检验机构名称")
+	private String JDUnitName;
+	@ApiModelProperty(value = "形式试验机构名称")
+	private String XSUnitName;
+	@ApiModelProperty(value = "产权单位名称")
+	private String CQUnitName;
+	@ApiModelProperty(value = "产权单位统一社会信用代码")
+	private String CQUnitCode;
+	@ApiModelProperty(value = "生产时间")
+	private Date recordDate;
+}

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

+package com.yeejoin.amos.api.openapi.face.orm.entity;
+
+import lombok.Data;
+
+@Data
+public class PageParam {
+
+	int current = 0;
+
+	int size = 10;
+
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipmentService.java

+package com.yeejoin.amos.api.openapi.face.service;
+
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.api.openapi.face.model.EquipmentModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.EquipmentMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.Equipment;
+import com.yeejoin.amos.api.openapi.face.orm.entity.PageParam;
+
+@Service
+public class EquipmentService extends AppBaseService<EquipmentModel, Equipment, EquipmentMapper> {
+
+	@Autowired
+	EquipmentMapper equipmentMapper;
+
+	public IPage<EquipmentModel> page(PageParam pageParam, Date startTime,Date endTime) {
+		Page<EquipmentModel> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+		return equipmentMapper.page(page,startTime, endTime);
+	}
+}

amos-boot-data/amos-boot-data-openapi/src/main/resources/mapper/EquipmentMapper.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.amos.api.openapi.face.orm.dao.EquipmentMapper">
+
+	<!-- <select id="page"
+		resultType="com.yeejoin.amos.boot.module.tzs.api.dto.EquipmentModel">
+		SELECT
+		supervise.sequence_nbr,
+		registration.use_org_code AS useRegistrationNumber,
+		use1.use_unit_name AS useUnit,
+		registration.equ_list AS equipmentType,
+		registration.equ_category AS equipmentCategory,
+		registration.equ_define AS equipmentVariety,
+		registration.product_name AS equipmentName,
+		registration.equ_code AS equipmentCode,
+		registration.sequence_code AS equipmentNumber,
+		use1.use_inner_code AS internalNumber,
+		registration.organization_name AS registrationOrgan,
+		NULL AS registrationDate,
+		CONCAT(use1.province,use1.city,use1.county,use1.street,use1.address)AS useUnitAddress,
+		use1.use_unit_credit_code AS useUnitCode,
+		use1.area_code AS useUnitAreaCode,
+		use1.equ_state AS regStatus,
+		use1.use_state_change_date AS useStatusUpdate,
+		use1.changes AS changeStatus,
+		use1.use_state_change_date AS changeUpdate,
+		use1.use_date AS useDate,
+		design.design_unit_name AS designUnitName,
+		maintenance.me_unit_name AS manUnitName,
+		(SELECT construct.usc_unit_name FROM tz_jg_construction_info construct WHERE construct.sequence_code = supervise.sequence_code ORDER BY construct.sync_date DESC LIMIT 1) AS builderUnitName,
+		NULL AS JDUnitName,
+		NULL AS XSUnitName,
+		produce.produce_unit_name AS CQUnitName,
+		produce.produce_unit_credit_code AS CQUnitCode,
+		supervise.sync_date AS recordDate
+		FROM tz_jg_supervise_info supervise
+		LEFT JOIN
+		tz_jg_use_info use1 ON use1.sequence_code =
+		supervise.sequence_code
+		LEFT JOIN tz_jg_maintenance_info maintenance ON
+		maintenance.sequence_code
+		= supervise.sequence_code
+		LEFT JOIN
+		tz_jg_registration_info registration ON
+		registration.sequence_code =
+		supervise.sequence_code
+		LEFT JOIN tz_jg_other_info other ON
+		other.sequence_code =
+		supervise.sequence_code
+		LEFT JOIN
+		tz_jg_produce_info produce ON produce.sequence_code =
+		supervise.sequence_code
+		LEFT JOIN
+		tz_jg_design_info design ON design.sequence_code =
+		supervise.sequence_code
+		<where>
+             <if
+				test="startTime !=null and  endTime !=null">
+				supervise.sync_date BETWEEN #{startTime} AND #{endTime} 
+				OR use1.sync_date BETWEEN #{startTime} AND #{endTime} 
+				OR maintenance.sync_date BETWEEN #{startTime} AND #{endTime} 
+				OR registration.sync_date BETWEEN #{startTime} AND #{endTime} 
+				OR other.sync_date BETWEEN #{startTime} AND #{endTime} 
+				OR produce.sync_date BETWEEN #{startTime} AND #{endTime} 
+				OR design.sync_date BETWEEN #{startTime} AND #{endTime} 
+				OR (SELECT construct.sync_date FROM tz_jg_construction_info construct WHERE construct.sequence_code = supervise.sequence_code ORDER BY construct.sync_date DESC LIMIT 1) BETWEEN #{startTime} AND #{endTime} 
+			</if>
+		</where>
+	</select> -->
+	
+	
+	<select id="page"
+		resultType="com.yeejoin.amos.api.openapi.face.model.EquipmentModel">
+		SELECT
+		*
+		FROM 
+		tm_equipment_info
+		<where>
+             <if
+				test="startTime !=null and  endTime !=null">
+				record_date BETWEEN #{startTime} AND #{endTime}  
+			</if>
+		</where>
+	</select>
+</mapper>

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

@@ -42,7 +42,7 @@ public interface IRegUnitInfoService {
      * 获取管辖机构树
      * @return 组织架构中单位级别为：省级、地市级、区县级的单位
      */
-    Collection getManagementUnitTree();
+    Collection getManagementUnitTree(String orgCode);
 
     /**
      * 单位注销

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

@@ -82,8 +82,8 @@ public class RegUnitInfoController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "/management-unit/tree")
     @ApiOperation(httpMethod = "GET", value = "管辖机构树", notes = "管辖机构树")
-    public ResponseModel<Collection> managementUnitTree() {
-        Collection result = iRegUnitInfoService.getManagementUnitTree();
+    public ResponseModel<Collection> managementUnitTree(@RequestParam(required = false)String orgCode) {
+        Collection result = iRegUnitInfoService.getManagementUnitTree(orgCode);
         return ResponseHelper.buildResponse(result);
     }
 

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

@@ -238,10 +238,17 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
     }
 
     @Override
-    public Collection getManagementUnitTree() {
+    public Collection getManagementUnitTree(String orgCode) {
         tzsAuthServiceImpl.setRequestContext();
         // 组织架构中单位级别为：省级、地市级、区县级的单位
-        List<CompanyModel> companyModels = (List<CompanyModel>) Privilege.companyClient.queryAgencyTree(null).getResult();
+        List<CompanyModel> companyModels = new ArrayList<CompanyModel>();
+        if(StringUtils.isEmpty(orgCode)) 
+        {
+        	  companyModels = (List<CompanyModel>) Privilege.companyClient.queryAgencyTree(null).getResult();
+        }else 
+        {
+        	  companyModels = (List<CompanyModel>) Privilege.companyClient.queryByOrgcode(orgCode).getResult();
+        }
         return companyModels.stream().filter(c -> "headquarter".equals(c.getLevel()) || "prefecture-level".equals(c.getLevel()) || "county".equals(c.getLevel())).map(this::dealChildCompany).collect(Collectors.toList());
     }