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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/constants/TerminalConstant.java

+package com.yeejoin.amos.boot.biz.common.constants;
+
+/**
+ * @Author: xl
+ * @Description: 终端标识
+ * @Date: 2021/11/17 11:40
+ */
+public class TerminalConstant {
+    public final static String APP = "APP";
+    public final static String WEB = "WEB";
+    public final static String APP_WEB = "APP/WEB";
+}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/DataDictionaryController.java

@@ -349,4 +349,29 @@ public class DataDictionaryController extends BaseController {
 		return ResponseHelper.buildResponse(type);
 	}
 
+
+	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/gwmcDataDictionaryNotoken/{type}", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典不验证token", notes = "根据字典类型查询字典不验证token")
+	public ResponseModel<Object> gwmcDataDictionaryNotoken(@PathVariable String type) throws Exception {
+		// 数据字典生成树方法 原先通过getCode做主键 现修改为 getSequenceNbr 后期数据字典parent字段保存id 而不要保存code by
+		// kongfm 2021-09-08
+		// 数据字典还原 by kongfm 2021-09-09
+		QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("type", type);
+		queryWrapper.orderByAsc("sort_num");
+
+		if (redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE + type)) {
+			Object obj = redisUtils.get(RedisKey.DATA_DICTIONARY_CODE + type);
+			return ResponseHelper.buildResponse(obj);
+		} else {
+			Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
+			List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
+					"getParent", null);
+			redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
+			return ResponseHelper.buildResponse(menus);
+		}
+	}
+
+
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/enums/RuleTypeEnum.java

 package com.yeejoin.amos.boot.biz.common.enums;
 
+import com.yeejoin.amos.boot.biz.common.constants.TerminalConstant;
+
 /**
  * 规则请求枚举
  * @author xl
  *
  */
 public enum RuleTypeEnum {
+
 	// 防火监督
-	计划提交("计划提交", "addPlan","auditPage"),
-	计划审核("计划审核", "planAudit", "auditPage"),
-	计划审核完成("计划审核完成", "planAuditAll", "formulatePage"),
-	计划生成("计划生成", "addPlanTask", null),
-	计划完成("计划完成", "planCompleted", null),
+	计划提交("计划提交", "addPlan","auditPage", TerminalConstant.WEB),
+	计划审核("计划审核", "planAudit", "auditPage", TerminalConstant.APP_WEB),
+	计划审核完成("计划审核完成", "planAuditAll", "formulatePage", TerminalConstant.APP_WEB),
+	计划生成("计划生成", "addPlanTask", null, TerminalConstant.APP),
+	计划完成("计划完成", "planCompleted", null, TerminalConstant.APP_WEB),
 
 	// 隐患
-	隐患第一次提交("隐患提交", "addLatentDanger", null),
-	隐患审核("隐患审核", "dangerAudit", null);
+	隐患第一次提交("隐患提交", "addLatentDanger", null, null),
+	隐患审核("隐患审核", "dangerAudit", null, null);
 
 	/**
 	 * 名称，描述
@@ -29,6 +32,10 @@ public enum RuleTypeEnum {
 	 * 跳转地址
 	 */
 	private String url;
+	/**
+	 * 终端标识
+	 */
+	private String terminal;
 
 	public String getName() {
 		return name;
@@ -54,10 +61,19 @@ public enum RuleTypeEnum {
 		this.url = url;
 	}
 
-	RuleTypeEnum(String name, String code, String url) {
+	public String getTerminal() {
+		return terminal;
+	}
+
+	public void setTerminal(String terminal) {
+		this.terminal = terminal;
+	}
+
+	RuleTypeEnum(String name, String code, String url, String terminal) {
 		this.name = name;
 		this.code = code;
 		this.url = url;
+		this.terminal = terminal;
 	}
 
 	public static RuleTypeEnum getEnumByCode(String field){

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/RedisKey.java

@@ -39,6 +39,9 @@ public class RedisKey {
 
     /**联通CTIuser token */
     public static final String CTI_USER_TOKEN = "cti_user_token";
+
+    /** 企业用户注册前缀 */
+    public static final String FLC_USER_TEL = "flc_tel_";
     
     /** 驼峰转下划线(简单写法，效率低于 ) */
 	public static String humpToLine(String str) {

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/RuleUtils.java

 package com.yeejoin.amos.boot.biz.common.utils;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.util.Map;
@@ -13,7 +14,7 @@ import java.util.Map;
 public class RuleUtils {
 
     public static String instedParams(String content, Object msgObj) {
-        Map<String, Object> strengthMap = JSON.parseObject(JSON.toJSONString(msgObj), Map.class);
+        Map<String, Object> strengthMap = JSON.parseObject(JSON.toJSONString(msgObj, SerializerFeature.WriteMapNullValue), Map.class);
         for (String key : strengthMap.keySet())
             content = content.replaceAll("\\$\\{" + key + "}", String.valueOf(ValidationUtil.isEmpty(strengthMap.get(key)) ? "" : strengthMap.get(key)));
         return content;

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/mapper/FireRiskSourceMapper.java

 package com.yeejoin.amos.boot.module.ccs.api.mapper;
 
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireRiskSourceDto;
 import com.yeejoin.amos.boot.module.ccs.api.entity.FireRiskSource;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 风险点表 Mapper 接口
@@ -11,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface FireRiskSourceMapper extends BaseMapper<FireRiskSource> {
 
+    List<FireRiskSourceDto> queryForRpnDescList(@Param("stationCode") String stationCode, @Param("top") String top);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/mapper/FireRpnChangeLogMapper.java

 package com.yeejoin.amos.boot.module.ccs.api.mapper;
 
-import com.yeejoin.amos.boot.module.ccs.api.entity.FireRpnChangeLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.ccs.api.entity.FireRpnChangeLog;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.Map;
 
 /**
  * 风险点变化流水 Mapper 接口
@@ -11,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface FireRpnChangeLogMapper extends BaseMapper<FireRpnChangeLog> {
 
+    Map<String, Object> queryForRiseUp(@Param("stationCode") String stationCode, @Param("type") String type);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/service/IFireRpnChangeLogService.java

 package com.yeejoin.amos.boot.module.ccs.api.service;
 
 
+import java.util.Map;
+
 /**
  * 风险点变化流水接口类
  *
@@ -9,4 +11,5 @@ package com.yeejoin.amos.boot.module.ccs.api.service;
  */
 public interface IFireRpnChangeLogService {
 
+    Map<String,Object> queryForRiseUp(String stationCode);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireRiskSourceMapper.xml

@@ -2,4 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.ccs.api.mapper.FireRiskSourceMapper">
 
+    <select id="queryForRpnDescList" resultType="com.yeejoin.amos.boot.module.ccs.api.dto.FireRiskSourceDto">
+        SELECT
+            rs.mrid,
+            rs.`name`,
+            rs.parent_mrid,
+            IFNULL(rs.rpn, 0) rpn,
+            IFNULL(rs.rpni, 0) rpni
+        FROM `asf_fire_risk_source` rs
+        where
+        rs.parent_mrid > 0
+        and rs.station_code = #{stationCode}
+        <if test="top != null and top !=''">
+            limit ${top}
+        </if>
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireRpnChangeLogMapper.xml

@@ -2,4 +2,31 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.ccs.api.mapper.FireRpnChangeLogMapper">
 
+    <select id="queryForRiseUp" resultType="java.util.Map">
+      select
+		d.countOfType0,
+		d.countOfSource,
+		CONCAT(ROUND(IFNULL(d.countOfType0/d.countOfSource,0)*100,2),'%')type0Rate
+		 from
+		(SELECT
+			count(DISTINCT cl.risk_point_mrid) countOfType0,
+			(select count(1) from asf_fire_risk_source rs where rs.station_code=cl.station_code ) countOfSource
+		FROM
+			asf_fire_rpn_change_log cl
+		WHERE
+			cl.level_change_type = 0
+			and cl.station_code = #{stationCode}
+			<choose>
+                <when test="type = '1'">
+                    and DATE_FORMAT( cl.create_date, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m')
+                </when>
+                <when test="type = '2'">
+                    and QUARTER(cl.create_date)=QUARTER(now());
+                </when>
+                <when test="type = '3'">
+                    and year(cl.create_date)=year(now())
+                </when>
+            </choose>
+		)d
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/TzsCommonParam.java

@@ -37,4 +37,11 @@ public class TzsCommonParam {
     public static final String APPJJ = "APPJJ";
     public static final String DD = "DD";
     public static final String JC = "JC";
+
+    public static final String LICENCE_PIC = "licencePic";
+    public static final String ADMIN_LICENSE_PIC = "adminLicensePic";
+    public static final String QR_CODE = "qrCode";
+    public static final String UNIT_TYPE = "UNIT_TYPE";
+
+
 }

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

@@ -36,4 +36,10 @@ public class UnitInfoApproveDto extends BaseDto {
     @ApiModelProperty(value = "0 注册审批 1 变更审批")
     private Integer approveType;
 
+    @ApiModelProperty(value = "企业入驻时间")
+    private Date approvedTime;
+
+    @ApiModelProperty(value = "提交时间")
+    private Date submitTime;
+
 }

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

@@ -36,6 +36,9 @@ public class UnitInfoChangeDto extends BaseDto {
     @ApiModelProperty(value = "单位类型code")
     private String unitTypeCode;
 
+    @ApiModelProperty(value = "组织机构编码")
+    private String organizationCode;
+
     @ApiModelProperty(value = "主管部门")
     private String comptentDept;
 

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

 package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 企业信息表
@@ -25,10 +28,13 @@ public class UnitInfoDto extends BaseDto {
     private String orgName;
 
     @ApiModelProperty(value = "证照类型")
-    private String licenseType;
+    private String licenceType;
 
     @ApiModelProperty(value = "证照类型code")
-    private String licenseTypeCode;
+    private String licenceTypeCode;
+
+    @ApiModelProperty(value = "组织机构编码")
+    private String organizationCode;
 
     @ApiModelProperty(value = "单位类型")
     private String unitType;
@@ -94,10 +100,10 @@ public class UnitInfoDto extends BaseDto {
     private Date createTime;
 
     @ApiModelProperty(value = "单位法人")
-    private String legelPerson;
+    private String legalPerson;
 
     @ApiModelProperty(value = "法人电话")
-    private String legelPersonTel;
+    private String legalPersonTel;
 
     @ApiModelProperty(value = "单位联系人")
     private String contactPerson;
@@ -126,4 +132,37 @@ public class UnitInfoDto extends BaseDto {
     @ApiModelProperty(value = "审批状态 0 审批中 1 审批结束 2 驳回")
     private Integer unitStatus;
 
+   @ApiModelProperty(value = "证照图片")
+   private List<AttachmentDto> licencePic;
+
+   @ApiModelProperty(value = "管理员身份证")
+   private List<AttachmentDto> adminLicensePic;
+
+   @ApiModelProperty(value = "是否变更 0 未变更 1 变更中")
+   private Boolean isChange;
+
+  @ApiModelProperty(value = "提交时间开始")
+  private String submitTimeStart ;
+
+  @ApiModelProperty(value = "提交时间结束")
+  private String submitTimeEnd ;
+
+ @ApiModelProperty(value = "分类名称")
+  private String typeStr;
+
+ @ApiModelProperty(value = "状态名称")
+  private String statusStr;
+
+ @ApiModelProperty(value = "企业二维码")
+  private List<AttachmentDto> qrcode;
+
+ @ApiModelProperty(value = "详细地址全部")
+ private String fullAddress;
+
+ @ApiModelProperty(value = "企业入驻时间")
+ private Date approvedTime;
+
+ @ApiModelProperty(value = "提交时间")
+ private Date submitTime;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/UnitInfo.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -31,14 +32,20 @@ public class UnitInfo extends BaseEntity {
     /**
      * 证照类型
      */
-	@TableField("license_type")
-    private String licenseType;
+	@TableField("licence_type")
+    private String licenceType;
 
     /**
      * 证照类型code
      */
-	@TableField("license_type_code")
-    private String licenseTypeCode;
+	@TableField("licence_type_code")
+    private String licenceTypeCode;
+
+    /**
+     * 组织机构编码
+     */
+    @TableField("organization_code")
+    private String organizationCode;
 
     /**
      * 单位类型
@@ -169,14 +176,14 @@ public class UnitInfo extends BaseEntity {
     /**
      * 单位法人
      */
-	@TableField("legel_person")
-    private String legelPerson;
+	@TableField("legal_person")
+    private String legalPerson;
 
     /**
      * 法人电话
      */
-	@TableField("legel_person_tel")
-    private String legelPersonTel;
+	@TableField("legal_person_tel")
+    private String legalPersonTel;
 
     /**
      * 单位联系人
@@ -232,4 +239,22 @@ public class UnitInfo extends BaseEntity {
 	@TableField("unit_status")
     private Integer unitStatus;
 
+    /**
+     * 是否变更 0 未变更 1 变更中
+     */
+    @TableField(value = "is_change")
+    private Boolean isChange;
+
+
+    /**
+     * 企业入驻时间
+     */
+    @TableField("approved_time")
+    private Date approvedTime;
+    /**
+     * 提交时间
+     */
+    @TableField("submit_time")
+    private Date submitTime;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/UnitInfoChange.java

@@ -31,14 +31,20 @@ public class UnitInfoChange extends BaseEntity {
     /**
      * 证照类型
      */
-	@TableField("license_type")
-    private String licenseType;
+	@TableField("licence_type")
+    private String licenceType;
 
     /**
      * 证照类型code
      */
-	@TableField("license_type_code")
-    private String licenseTypeCode;
+	@TableField("licence_type_code")
+    private String licenceTypeCode;
+
+    /**
+     * 组织机构编码
+     */
+    @TableField("organization_code")
+    private String organizationCode;
 
     /**
      * 单位类型
@@ -169,14 +175,14 @@ public class UnitInfoChange extends BaseEntity {
     /**
      * 单位法人
      */
-	@TableField("legel_person")
-    private String legelPerson;
+	@TableField("legal_person")
+    private String legalPerson;
 
     /**
      * 法人电话
      */
-	@TableField("legel_person_tel")
-    private String legelPersonTel;
+	@TableField("legal_person_tel")
+    private String legalPersonTel;
 
     /**
      * 单位联系人
@@ -208,4 +214,17 @@ public class UnitInfoChange extends BaseEntity {
 	@TableField("unit_status")
     private Integer unitStatus;
 
+
+    /**
+     * 企业入驻时间
+     */
+    @TableField("approved_time")
+    private Date approvedTime;
+
+    /**
+     * 提交时间
+     */
+    @TableField("submit_time")
+    private Date submitTime;
+
 }

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

 package com.yeejoin.amos.boot.module.tzs.flc.api.service;
 
 
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitInfoApproveDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitInfoDto;
+
 /**
  * 企业信息表接口类
  *
@@ -9,4 +12,12 @@ package com.yeejoin.amos.boot.module.tzs.flc.api.service;
  */
 public interface IUnitInfoService {
 
+    /**
+     * 审批企业注册信息
+     * @param approveDto
+     * @return
+     */
+    UnitInfoDto approve(UnitInfoApproveDto approveDto);
+
+    UnitInfoDto getDtoById(Long sequenceNbr);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireFmeaStatisticsController.java

 package com.yeejoin.amos.boot.module.ccs.biz.controller;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.ccs.api.dto.FireFmeaStatisticsDto;
 import com.yeejoin.amos.boot.module.ccs.biz.service.impl.FireFmeaStatisticsServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -13,7 +13,6 @@ 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 javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -23,83 +22,13 @@ import java.util.List;
  * @date 2021-11-09
  */
 @RestController
-@Api(tags = "发生率/严重度矩阵统计表Api")
+@Api(tags = "发生率-严重度矩阵统计表Api")
 @RequestMapping(value = "/fire-fmea-statistics")
 public class FireFmeaStatisticsController extends BaseController {
 
     @Autowired
     FireFmeaStatisticsServiceImpl fireFmeaStatisticsServiceImpl;
 
-    /**
-     * 新增发生率/严重度矩阵统计表
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "新增发生率/严重度矩阵统计表", notes = "新增发生率/严重度矩阵统计表")
-    public ResponseModel<FireFmeaStatisticsDto> save(@RequestBody FireFmeaStatisticsDto model) {
-        model = fireFmeaStatisticsServiceImpl.createWithModel(model);
-        return ResponseHelper.buildResponse(model);
-    }
-
-    /**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PutMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新发生率/严重度矩阵统计表", notes = "根据sequenceNbr更新发生率/严重度矩阵统计表")
-    public ResponseModel<FireFmeaStatisticsDto> updateBySequenceNbrFireFmeaStatistics(@RequestBody FireFmeaStatisticsDto model, @PathVariable(value = "sequenceNbr") String sequenceNbr) {
-        model.setId(sequenceNbr);
-        return ResponseHelper.buildResponse(fireFmeaStatisticsServiceImpl.updateWithModel(model));
-    }
-
-    /**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除发生率/严重度矩阵统计表", notes = "根据sequenceNbr删除发生率/严重度矩阵统计表")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireFmeaStatisticsServiceImpl.removeById(sequenceNbr));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个发生率/严重度矩阵统计表", notes = "根据sequenceNbr查询单个发生率/严重度矩阵统计表")
-    public ResponseModel<FireFmeaStatisticsDto> selectOne(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireFmeaStatisticsServiceImpl.queryBySeq(sequenceNbr));
-    }
-
-    /**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/page")
-    @ApiOperation(httpMethod = "GET", value = "发生率/严重度矩阵统计表分页查询", notes = "发生率/严重度矩阵统计表分页查询")
-    public ResponseModel<Page<FireFmeaStatisticsDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size) {
-        Page<FireFmeaStatisticsDto> page = new Page<>();
-        page.setCurrent(current);
-        page.setSize(size);
-        return ResponseHelper.buildResponse(fireFmeaStatisticsServiceImpl.queryForFireFmeaStatisticsPage(page));
-    }
 
     /**
      * 列表全部数据查询
@@ -107,9 +36,10 @@ public class FireFmeaStatisticsController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "发生率/严重度矩阵统计表列表全部数据查询", notes = "发生率/严重度矩阵统计表列表全部数据查询")
-    @GetMapping(value = "/list")
-    public ResponseModel<List<FireFmeaStatisticsDto>> selectForList() {
-        return ResponseHelper.buildResponse(fireFmeaStatisticsServiceImpl.queryForFireFmeaStatisticsList());
+    @ApiOperation(httpMethod = "GET", value = "发生率-严重度矩阵统计", notes = "发生率-严重度矩阵统计")
+    @GetMapping(value = "/{stationCode}/list")
+    public ResponseModel<List<FireFmeaStatisticsDto>> selectForList(
+            @ApiParam(value = "换流站code", required = true) @PathVariable String stationCode) {
+        return ResponseHelper.buildResponse(fireFmeaStatisticsServiceImpl.queryForFireFmeaStatisticsList(stationCode));
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireRiskSourceController.java

 package com.yeejoin.amos.boot.module.ccs.biz.controller;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireRiskSourceDto;
 import com.yeejoin.amos.boot.module.ccs.biz.service.impl.FireRiskSourceServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -13,9 +12,6 @@ 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 javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
 /**
  * 风险点表
  *
@@ -30,62 +26,6 @@ public class FireRiskSourceController extends BaseController {
     @Autowired
     FireRiskSourceServiceImpl fireRiskSourceServiceImpl;
 
-    /**
-     * 新增风险点表
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "新增风险点表", notes = "新增风险点表")
-    public ResponseModel<FireRiskSourceDto> save(@RequestBody FireRiskSourceDto model) {
-        model = fireRiskSourceServiceImpl.createWithModel(model);
-        return ResponseHelper.buildResponse(model);
-    }
-
-    /**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除风险点表", notes = "根据sequenceNbr删除风险点表")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireRiskSourceServiceImpl.removeById(sequenceNbr));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个风险点表", notes = "根据sequenceNbr查询单个风险点表")
-    public ResponseModel<FireRiskSourceDto> selectOne(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireRiskSourceServiceImpl.queryBySeq(sequenceNbr));
-    }
-
-    /**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/page")
-    @ApiOperation(httpMethod = "GET", value = "风险点表分页查询", notes = "风险点表分页查询")
-    public ResponseModel<Page<FireRiskSourceDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size) {
-        Page<FireRiskSourceDto> page = new Page<FireRiskSourceDto>();
-        page.setCurrent(current);
-        page.setSize(size);
-        return ResponseHelper.buildResponse(fireRiskSourceServiceImpl.queryForFireRiskSourcePage(page));
-    }
 
     /**
      * 列表全部数据查询
@@ -93,9 +33,11 @@ public class FireRiskSourceController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "风险点表列表全部数据查询", notes = "风险点表列表全部数据查询")
-    @GetMapping(value = "/list")
-    public ResponseModel<List<FireRiskSourceDto>> selectForList() {
-        return ResponseHelper.buildResponse(fireRiskSourceServiceImpl.queryForFireRiskSourceList());
+    @ApiOperation(httpMethod = "GET", value = "查询风险点RPN统计", notes = "查询风险点RPN统计")
+    @GetMapping(value = "/{stationCode}/list")
+    public ResponseModel selectForRpnTopList(
+            @ApiParam(value = "换流站code", required = true) @PathVariable String stationCode,
+            @ApiParam(value = "top值") @RequestParam(required = false) String top) {
+        return ResponseHelper.buildResponse(fireRiskSourceServiceImpl.selectForRpnTopList(stationCode, top));
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireRpnChangeLogController.java

 package com.yeejoin.amos.boot.module.ccs.biz.controller;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireRpnChangeLogDto;
 import com.yeejoin.amos.boot.module.ccs.biz.service.impl.FireRpnChangeLogServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+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 javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
 /**
  * 风险点变化流水
  *
@@ -30,72 +28,16 @@ public class FireRpnChangeLogController extends BaseController {
     @Autowired
     FireRpnChangeLogServiceImpl fireRpnChangeLogServiceImpl;
 
-    /**
-     * 新增风险点变化流水
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "新增风险点变化流水", notes = "新增风险点变化流水")
-    public ResponseModel<FireRpnChangeLogDto> save(@RequestBody FireRpnChangeLogDto model) {
-        model = fireRpnChangeLogServiceImpl.createWithModel(model);
-        return ResponseHelper.buildResponse(model);
-    }
-
-    /**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除风险点变化流水", notes = "根据sequenceNbr删除风险点变化流水")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireRpnChangeLogServiceImpl.removeById(sequenceNbr));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个风险点变化流水", notes = "根据sequenceNbr查询单个风险点变化流水")
-    public ResponseModel<FireRpnChangeLogDto> selectOne(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireRpnChangeLogServiceImpl.queryBySeq(sequenceNbr));
-    }
-
-    /**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/page")
-    @ApiOperation(httpMethod = "GET", value = "风险点变化流水分页查询", notes = "风险点变化流水分页查询")
-    public ResponseModel<Page<FireRpnChangeLogDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size) {
-        Page<FireRpnChangeLogDto> page = new Page<FireRpnChangeLogDto>();
-        page.setCurrent(current);
-        page.setSize(size);
-        return ResponseHelper.buildResponse(fireRpnChangeLogServiceImpl.queryForFireRpnChangeLogPage(page));
-    }
 
     /**
-     * 列表全部数据查询
+     * 风险点(PRN)上升百分比
      *
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "风险点变化流水列表全部数据查询", notes = "风险点变化流水列表全部数据查询")
-    @GetMapping(value = "/list")
-    public ResponseModel<List<FireRpnChangeLogDto>> selectForList() {
-        return ResponseHelper.buildResponse(fireRpnChangeLogServiceImpl.queryForFireRpnChangeLogList());
+    @ApiOperation(httpMethod = "GET", value = "风险点(PRN)上升百分比", notes = "风险点(PRN)上升百分比")
+    @GetMapping(value = "/{stationCode}/riseUp")
+    public ResponseModel riseUp(@PathVariable String stationCode) {
+        return ResponseHelper.buildResponse(fireRpnChangeLogServiceImpl.queryForRiseUp(stationCode));
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireFmeaStatisticsServiceImpl.java

 package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireFmeaStatisticsDto;
 import com.yeejoin.amos.boot.module.ccs.api.entity.FireFmeaStatistics;
 import com.yeejoin.amos.boot.module.ccs.api.mapper.FireFmeaStatisticsMapper;
 import com.yeejoin.amos.boot.module.ccs.api.service.IFireFmeaStatisticsService;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireFmeaStatisticsDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.util.List;
 
 /**
@@ -16,18 +17,20 @@ import java.util.List;
  * @date 2021-11-09
  */
 @Service
-public class FireFmeaStatisticsServiceImpl extends BaseService<FireFmeaStatisticsDto,FireFmeaStatistics,FireFmeaStatisticsMapper> implements IFireFmeaStatisticsService {
+public class FireFmeaStatisticsServiceImpl extends BaseService<FireFmeaStatisticsDto, FireFmeaStatistics, FireFmeaStatisticsMapper> implements IFireFmeaStatisticsService {
     /**
      * 分页查询
      */
-    public Page<FireFmeaStatisticsDto> queryForFireFmeaStatisticsPage(Page<FireFmeaStatisticsDto> page)   {
+    public Page<FireFmeaStatisticsDto> queryForFireFmeaStatisticsPage(Page<FireFmeaStatisticsDto> page) {
         return this.queryForPage(page, null, false);
     }
 
     /**
      * 列表查询 示例
+     *
+     * @param stationCode 换流站编号
      */
-    public List<FireFmeaStatisticsDto> queryForFireFmeaStatisticsList()   {
-        return this.queryForList("" , false);
+    public List<FireFmeaStatisticsDto> queryForFireFmeaStatisticsList(String stationCode) {
+        return this.queryForTopList(20, "mutiby", false, stationCode);
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireRiskSourceServiceImpl.java

 package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
 
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireRiskSourceDto;
 import com.yeejoin.amos.boot.module.ccs.api.entity.FireRiskSource;
 import com.yeejoin.amos.boot.module.ccs.api.mapper.FireRiskSourceMapper;
 import com.yeejoin.amos.boot.module.ccs.api.service.IFireRiskSourceService;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireRiskSourceDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.util.List;
 
 /**
@@ -16,18 +16,9 @@ import java.util.List;
  * @date 2021-11-09
  */
 @Service
-public class FireRiskSourceServiceImpl extends BaseService<FireRiskSourceDto,FireRiskSource,FireRiskSourceMapper> implements IFireRiskSourceService {
-    /**
-     * 分页查询
-     */
-    public Page<FireRiskSourceDto> queryForFireRiskSourcePage(Page<FireRiskSourceDto> page)   {
-        return this.queryForPage(page, null, false);
-    }
+public class FireRiskSourceServiceImpl extends BaseService<FireRiskSourceDto, FireRiskSource, FireRiskSourceMapper> implements IFireRiskSourceService {
 
-    /**
-     * 列表查询 示例
-     */
-    public List<FireRiskSourceDto> queryForFireRiskSourceList()   {
-        return this.queryForList("" , false);
+    public List<FireRiskSourceDto> selectForRpnTopList(String stationCode, String top) {
+        return this.baseMapper.queryForRpnDescList(stationCode, top);
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireRpnChangeLogServiceImpl.java

 package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
 
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireRpnChangeLogDto;
 import com.yeejoin.amos.boot.module.ccs.api.entity.FireRpnChangeLog;
 import com.yeejoin.amos.boot.module.ccs.api.mapper.FireRpnChangeLogMapper;
 import com.yeejoin.amos.boot.module.ccs.api.service.IFireRpnChangeLogService;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireRpnChangeLogDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 风险点变化流水服务实现类
@@ -16,18 +17,20 @@ import java.util.List;
  * @date 2021-11-09
  */
 @Service
-public class FireRpnChangeLogServiceImpl extends BaseService<FireRpnChangeLogDto,FireRpnChangeLog,FireRpnChangeLogMapper> implements IFireRpnChangeLogService {
-    /**
-     * 分页查询
-     */
-    public Page<FireRpnChangeLogDto> queryForFireRpnChangeLogPage(Page<FireRpnChangeLogDto> page)   {
-        return this.queryForPage(page, null, false);
-    }
+public class FireRpnChangeLogServiceImpl extends BaseService<FireRpnChangeLogDto, FireRpnChangeLog, FireRpnChangeLogMapper> implements IFireRpnChangeLogService {
 
-    /**
-     * 列表查询 示例
-     */
-    public List<FireRpnChangeLogDto> queryForFireRpnChangeLogList()   {
-        return this.queryForList("" , false);
+    @Override
+    public Map<String, Object> queryForRiseUp(String stationCode) {
+        Map<String, Object> result = new HashMap<>();
+        //本月
+        Map resultMonth = this.baseMapper.queryForRiseUp(stationCode, "1");
+        //本季度
+        Map resultSeason = this.baseMapper.queryForRiseUp(stationCode, "2");
+        //本年
+        Map resultYear = this.baseMapper.queryForRiseUp(stationCode, "3");
+        result.put("month", resultMonth);
+        result.put("season", resultSeason);
+        result.put("year", resultYear);
+        return result;
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireStationInfoServiceImpl.java

@@ -36,8 +36,8 @@ public class FireStationInfoServiceImpl extends BaseService<FireStationInfoDto,
     }
 
     @Override
-    public FireStationInfoDto getOneByCode(String stationCode) {
-        List<FireStationInfoDto> dtos = this.queryForList("", false, stationCode);
+    public FireStationInfoDto getOneByCode(String code) {
+        List<FireStationInfoDto> dtos = this.queryForList("", false, code);
         if (dtos.isEmpty()) {
             throw new RuntimeException("不存在指定数据");
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/RulePlanService.java

 package com.yeejoin.amos.supervision.business.service.impl;
 
+import com.yeejoin.amos.boot.biz.common.constants.TerminalConstant;
 import com.yeejoin.amos.boot.biz.common.enums.RuleTypeEnum;
 import com.yeejoin.amos.component.rule.RuleTrigger;
 import com.yeejoin.amos.supervision.business.dto.PlanRo;
@@ -27,10 +28,6 @@ public class RulePlanService {
     private final String packageId = "消息/addPlanRule";
     private final String msgType = "supervision";
 
-    private final String APP = "APP";
-    private final String WEB = "WEB";
-    private final String APP_WEB = "APP/WEB";
-
     @Autowired
     private RuleTrigger ruleTrigger;
 
@@ -47,7 +44,6 @@ public class RulePlanService {
     public Boolean addPlanAuditRule(Plan plan, List<String> userIds, RuleTypeEnum ruleType, String excuteStateName) throws Exception {
         PlanRo planRo = buildPlanRo(plan, userIds, ruleType);
         planRo.setExcuteStateName(excuteStateName);
-
         //触发规则
         ruleTrigger.publish(planRo, packageId, new String[0]);
         return true;
@@ -59,11 +55,21 @@ public class RulePlanService {
         planRo.setMsgType(msgType);
         planRo.setRuleType(ruleType.getCode());
         planRo.setRelationId(String.valueOf(plan.getId()));
+        planRo.setTerminal(ruleType.getTerminal());
+        Map<String, String> map = new HashMap<>();
+        map.put("planId", String.valueOf(plan.getId()));
 
         if (!ValidationUtil.isEmpty(ruleType.getUrl())){
-            Map<String, String> map = new HashMap<>();
             map.put("url", ruleType.getUrl());
-            planRo.setExtras(map);
+        }
+
+        if (TerminalConstant.WEB.equals(ruleType.getTerminal())){
+            planRo.setIsSendWeb(true);
+        } else if (TerminalConstant.APP.equals(ruleType.getTerminal())){
+            planRo.setIsSendApp(true);
+        } else if (TerminalConstant.APP_WEB.equals(ruleType.getTerminal())){
+            planRo.setIsSendWeb(true);
+            planRo.setIsSendApp(true);
         }
 
         if (ValidationUtil.isEmpty(userIds)) {
@@ -72,15 +78,10 @@ public class RulePlanService {
                 leadPeopleIds += "," + plan.getUserId();
             }
             userIds = (List<String>) jcsFeignClient.getAmosIdListByUserIds(leadPeopleIds).getResult();
-            planRo.setIsSendApp(true);
-            planRo.setTerminal(WEB);
-        } else {
-            planRo.setIsSendWeb(true);
-            planRo.setIsSendApp(false);
-            planRo.setTerminal(APP_WEB);
         }
         planRo.setSendTime(DateUtil.date2LongStr(new Date()));
         planRo.setRecivers(userIds);
+        planRo.setExtras(map);
         return planRo;
     }
 }

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

 package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.collect.Maps;
-import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
+import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
-import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
-import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
-import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
-import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledObjsDto;
-import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledQueryDto;
-import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledRecordDto;
-import com.yeejoin.amos.boot.module.tzs.api.dto.AlertHandlerDto;
-import com.yeejoin.amos.boot.module.tzs.api.dto.AlertHandlerInfoDto;
-import com.yeejoin.amos.boot.module.tzs.api.dto.AlertPaperInfoDto;
-import com.yeejoin.amos.boot.module.tzs.api.dto.DutySeatDto;
-import com.yeejoin.amos.boot.module.tzs.api.dto.FormValue;
-import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBusinessListDto;
-import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBussinessDto;
-import com.yeejoin.amos.boot.module.tzs.api.entity.AlertCalled;
-import com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue;
-import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchPaper;
-import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchTask;
-import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
-import com.yeejoin.amos.boot.module.tzs.api.entity.VoiceRecordFile;
-import com.yeejoin.amos.boot.module.tzs.api.enums.AlertStageEnums;
-import com.yeejoin.amos.boot.module.tzs.api.enums.DispatchPaperEnums;
-import com.yeejoin.amos.boot.module.tzs.api.enums.TzsCommonParam;
-import com.yeejoin.amos.boot.module.tzs.api.mapper.AlertCalledMapper;
-import com.yeejoin.amos.boot.module.tzs.api.service.IAlertCalledService;
 import com.yeejoin.amos.boot.module.tzs.api.service.TzsAuthService;
-import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
+import com.yeejoin.amos.component.feign.config.TokenOperation;
 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.CompanyModel;
+import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
+import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
+import com.yeejoin.amos.feign.privilege.model.RoleModel;
+import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.Bean;
 
 import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * 特种设备权限服务实现类
@@ -70,6 +39,22 @@ import java.util.stream.Collectors;
 @Service
 public class TzsAuthServiceImpl implements TzsAuthService {
 
+    @Autowired
+    RedisUtils redisUtils;
+
+    @Value("${cti.user.name}")
+    private String ctiUserName;
+
+    @Value("${cti.user.pwd}")
+    private String ctiUserPwd;
+
+
+    /**
+     * saveUserRedis设置过期时间
+     */
+    @Value("${redis.cache.failure.time}")
+    private Long redisRegionTimeSecond;
+
 
     @Override
     public List<String> getUserRegionCode() {
@@ -154,4 +139,86 @@ public class TzsAuthServiceImpl implements TzsAuthService {
         }
 
     }
+
+
+    private void loginCtiUser() {
+        String passwd = DesUtil.encode(ctiUserPwd, "qaz");
+        IdPasswordAuthModel loninData = new IdPasswordAuthModel();
+        loninData.setLoginId(ctiUserName);
+        loninData.setPassword(passwd);
+        FeignClientResult loginResult = Privilege.authClient.idpassword(loninData);
+        if(loginResult.getStatus() == 200) {
+            HashMap resultMap = (HashMap) loginResult.getResult();
+            redisUtils.set(RedisKey.CTI_USER_TOKEN,  resultMap.get("token").toString(), redisRegionTimeSecond);
+        }
+    }
+
+
+    public void setRequestContext() {
+        // 需要登录后台账号
+        RequestContext.setAppKey("AMOS_STUDIO");
+        RequestContext.setProduct("AMOS_STUDIO_WEB");
+        if(redisUtils.hasKey(RedisKey.CTI_USER_TOKEN)) {
+            // 验证token
+            boolean validToken = TokenOperation.refresh(redisUtils.get(RedisKey.CTI_USER_TOKEN).toString());
+            if(!validToken) { // 登陆
+                this.loginCtiUser();
+            }
+        } else { // 登陆
+            this.loginCtiUser();
+        }
+        String ctiToken = redisUtils.get(RedisKey.CTI_USER_TOKEN).toString();
+        RequestContext.setToken(ctiToken);
+        try {
+            FeignClientResult<AgencyUserModel> agencyUserModel = Privilege.agencyUserClient.queryByUserName(ctiUserName);
+            AgencyUserModel userModel = agencyUserModel.getResult();
+            RequestContext.setExeUserId(userModel.getUserId());
+            if (userModel == null) {
+                throw new Exception("无法获取用户信息");
+            }
+            saveUserRedis(userModel, ctiToken);
+        } catch (Exception e) {
+            //删除失效token缓存
+            throw new RuntimeException(e.getMessage());
+        }
+
+    }
+
+
+    private void saveUserRedis(AgencyUserModel user, String token) {
+        String authToken = RedisKey.buildReginKey(user.getUserId(), token);
+        if (redisUtils.hasKey(authToken)) {
+            return;
+        }
+        CompanyBo company = new CompanyBo();
+        DepartmentBo department = new DepartmentBo();
+        RoleBo role = new RoleBo();
+        CompanyModel companyM = user.getCompanys() != null ? user.getCompanys().get(0) : null ;
+        Bean.copyExistPropertis(companyM, company);
+        Map<Long, List<DepartmentModel>> mapDepartments = user.getCompanyDepartments();
+        DepartmentModel departmentM = companyM != null ? mapDepartments.get(companyM.getSequenceNbr()).get(0) : null ;
+        Bean.copyExistPropertis(departmentM, department);
+        Map<Long, List<RoleModel>> roles = user.getOrgRoles();
+        Long sequenceNbr;
+        if (departmentM == null) {
+            sequenceNbr = null;
+        } else {
+            sequenceNbr = departmentM.getSequenceNbr();
+        }
+        RoleModel roleM = null;
+        if (sequenceNbr == null) {
+            roleM = companyM != null ?roles.get(companyM.getSequenceNbr()).get(0) : null;
+        } else {
+            roleM = roles.get(sequenceNbr).get(0);
+        }
+        Bean.copyExistPropertis(roleM, role);
+        ReginParams reginParams = new ReginParams();
+        reginParams.setCompany(company);
+        reginParams.setRole(role);
+        reginParams.setDepartment(department);
+        reginParams.setUserModel(user);
+        redisUtils.set(authToken, JSONObject.toJSONString(reginParams), redisRegionTimeSecond);
+    }
+
+
 }
\ No newline at end of file

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

@@ -73,22 +73,13 @@ public class VoiceRecordLogServiceImpl extends BaseService<VoiceRecordLogDto,Voi
     @Autowired
     private VoiceRecordFileServiceImpl voiceRecordFileServiceImpl;
 
+    @Autowired
+    private TzsAuthServiceImpl tzsAuthServiceImpl;
+
     @Scheduled(fixedDelay=ONE_Minute)
     public void fixedDelayJob(){
-        // 需要登录后台账号
-        RequestContext.setAppKey("AMOS_STUDIO");
-        RequestContext.setProduct("AMOS_STUDIO_WEB");
-        if(redisUtils.hasKey(RedisKey.CTI_USER_TOKEN)) {
-            // 验证token
-            boolean validToken = TokenOperation.refresh(redisUtils.get(RedisKey.CTI_USER_TOKEN).toString());
-            if(!validToken) { // 登陆
-                loginCtiUser();
-            }
-        } else { // 登陆
-            loginCtiUser();
-        }
-        String ctiToken = redisUtils.get(RedisKey.CTI_USER_TOKEN).toString();
-        RequestContext.setToken(ctiToken);
+        // 设置token
+        tzsAuthServiceImpl.setRequestContext();
         // 首先查找未完成 且失败次数少于5 的 记录
         List<VoiceRecordLog> logList = this.list(new LambdaQueryWrapper<VoiceRecordLog>().eq(VoiceRecordLog::getIsDeal,false).lt(VoiceRecordLog::getDealTimes,5));
         if(logList != null && logList.size() >0) {
@@ -176,17 +167,6 @@ public class VoiceRecordLogServiceImpl extends BaseService<VoiceRecordLogDto,Voi
     }
 
 
-    private void loginCtiUser() {
-        String passwd = DesUtil.encode(ctiUserPwd, "qaz");
-        IdPasswordAuthModel loninData = new IdPasswordAuthModel();
-        loninData.setLoginId(ctiUserName);
-        loninData.setPassword(passwd);
-        FeignClientResult loginResult = Privilege.authClient.idpassword(loninData);
-        if(loginResult.getStatus() == 200) {
-            HashMap resultMap = (HashMap) loginResult.getResult();
-            redisUtils.set(RedisKey.CTI_USER_TOKEN,  resultMap.get("token").toString(), 25920000l);
-        }
-    }
 
 
 

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

@@ -6,6 +6,8 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.MaintenanceUnitDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
 import com.yeejoin.amos.boot.module.tzs.api.entity.MaintenanceUnit;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitInfoDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.UnitInfo;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -237,4 +239,38 @@ public class BeanDtoVoUtils {
             }
         });
     }
+
+    /**
+     * 将企业注册实体类转换为Vo
+     *
+     * @param page 原分页对象
+     * @return 转换后的分页对象
+     */
+    public static IPage<UnitInfoDto> unitInfoIPageDto(IPage<UnitInfo> page) {
+
+        return page.convert(item -> {
+            try {
+                UnitInfoDto target = new UnitInfoDto();
+                // 把原对象数据拷贝到新对象
+                BeanUtils.copyProperties(item, target);
+                if(item.getIsChange()) {
+                    target.setTypeStr("变更");
+                } else {
+                    target.setTypeStr("注册");
+                }
+                if(0 == item.getUnitStatus()) {
+                    target.setStatusStr("审批中");
+                } else if(1 == item.getUnitStatus()) {
+                    target.setStatusStr("审批结束");
+                } else if(2 == item.getUnitStatus()) {
+                    target.setStatusStr("已驳回");
+                }
+
+                target.setFullAddress(item.getProvince() + item.getCity() + item.getDistrict() + item.getStree() + item.getCommunity() + item.getAddress());
+                return target;
+            } catch (Exception e) {
+                return null;
+            }
+        });
+    }
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.AlertCalled;
+import com.yeejoin.amos.boot.module.tzs.biz.utils.AlertBeanDtoVoUtils;
+import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitInfoApproveDto;
 import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.UnitInfoApproveServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -66,19 +73,6 @@ public class UnitInfoApproveController extends BaseController {
     }
 
     /**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除企业信息审批意见表", notes = "根据sequenceNbr删除企业信息审批意见表")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(unitInfoApproveServiceImpl.removeById(sequenceNbr));
-    }
-
-    /**
      * 根据sequenceNbr查询
      *
      * @param sequenceNbr 主键
@@ -109,15 +103,6 @@ public class UnitInfoApproveController extends BaseController {
         return ResponseHelper.buildResponse(unitInfoApproveServiceImpl.queryForFlcUnitInfoApprovePage(page));
     }
 
-    /**
-     * 列表全部数据查询
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "企业信息审批意见表列表全部数据查询", notes = "企业信息审批意见表列表全部数据查询")
-    @GetMapping(value = "/list")
-    public ResponseModel<List<UnitInfoApproveDto>> selectForList() {
-        return ResponseHelper.buildResponse(unitInfoApproveServiceImpl.queryForFlcUnitInfoApproveList());
-    }
+
+
 }

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

@@ -75,4 +75,6 @@ mqtt.topic.cti.push=/cti/record
 
 cti.user.name=tzs_cti
 
-cti.user.pwd=a1234567
\ No newline at end of file
+cti.user.pwd=a1234567
+
+flc.sms.tempCode=SMS_TZS_0001
\ No newline at end of file

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

@@ -81,3 +81,5 @@ mqtt.topic.cti.push=/cti/record
 cti.user.name=tzs_cti
 
 cti.user.pwd=a1234567
+
+flc.sms.tempCode=SMS_TZS_0001

pom.xml

@@ -210,7 +210,7 @@
 		<dependency>
 			<groupId>com.yeejoin</groupId>
 			<artifactId>amos-feign-systemctl</artifactId>
-			<version>1.6.4-SNAPSHOT</version>
+			<version>${amos.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.swagger</groupId>