Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemNewAgreeUseController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 同意投入使用信息表 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-11
+ */
+@Controller
+@RequestMapping("/demNewAgreeUse")
+public class DemNewAgreeUseController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemNewDisagreeUseController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 不同意投入使用信息表 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-11
+ */
+@Controller
+@RequestMapping("/demNewDisagreeUse")
+public class DemNewDisagreeUseController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemNewLawController.java

@@ -0,0 +1,40 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.service.DemNewLawService;
+import com.usky.fire.service.vo.AdLicenseStatisticVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 法律文书记录表 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-11
+ */
+@RestController
+@RequestMapping("/demNewLaw")
+public class DemNewLawController {
+    @Autowired
+    private DemNewLawService demNewLawService;
+
+    /**
+     * 行政许可情况统计
+     */
+    @GetMapping("adLicenseStatistic")
+    public ApiResult<AdLicenseStatisticVO> adLicenseStatistic(){
+        return ApiResult.success(demNewLawService.adLicenseStatistic());
+
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/DemNewAgreeUse.java

@@ -0,0 +1,86 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 同意投入使用信息表
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemNewAgreeUse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 文号1
+     */
+    private String document1;
+
+    /**
+     * 文号2
+     */
+    private String document2;
+
+    /**
+     * 文号3
+     */
+    private String document3;
+
+    /**
+     * 文号4
+     */
+    private String document4;
+
+    /**
+     * 文号
+     */
+    private String document;
+
+    /**
+     * 被处罚单位名称
+     */
+    private String companyName;
+
+    /**
+     * 单位地址
+     */
+    private String comapnyAddress;
+
+    /**
+     * 申请日期
+     */
+    private LocalDateTime applicantTime;
+
+    /**
+     * 检查状态
+     */
+    private Integer checkStatus;
+
+    /**
+     * 是否删除
+     */
+    private Integer deleteFlag;
+
+    /**
+     * 场所名称
+     */
+    private String facilityName;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/DemNewDisagreeUse.java

@@ -0,0 +1,91 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 不同意投入使用信息表
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemNewDisagreeUse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 救援机构名称
+     */
+    private String rescueName;
+
+    /**
+     * 文号1
+     */
+    private String document1;
+
+    /**
+     * 文号2
+     */
+    private String document2;
+
+    /**
+     * 文号3
+     */
+    private String document3;
+
+    /**
+     * 文号4
+     */
+    private String document4;
+
+    /**
+     * 文号
+     */
+    private String document;
+
+    /**
+     * 申请单位名称
+     */
+    private String applicantCompany;
+
+    /**
+     * 场所名称
+     */
+    private String facilityName;
+
+    /**
+     * 场所地址
+     */
+    private String facilityAddress;
+
+    /**
+     * 安全检查日期
+     */
+    private LocalDateTime checkTime;
+
+    /**
+     * 消防安全问题
+     */
+    private String fireSafety;
+
+    /**
+     * 是否删除
+     */
+    private Integer deleteFlag;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/DemNewLaw.java

@@ -0,0 +1,50 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 法律文书记录表
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemNewLaw implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 文书名称
+     */
+    private String lawName;
+
+    /**
+     * 参考文件
+     */
+    private String documentTransmission;
+
+    /**
+     * 单位
+     */
+    private String companyName;
+
+    /**
+     * 检查类型
+     */
+    private String checkType;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/DemNewAgreeUseMapper.java

@@ -0,0 +1,18 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemNewAgreeUse;
+import com.usky.common.mybatis.core.CrudMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 同意投入使用信息表 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-11
+ */
+@Repository
+public interface DemNewAgreeUseMapper extends CrudMapper<DemNewAgreeUse> {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/DemNewDisagreeUseMapper.java

@@ -0,0 +1,18 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemNewDisagreeUse;
+import com.usky.common.mybatis.core.CrudMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 不同意投入使用信息表 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-11
+ */
+@Repository
+public interface DemNewDisagreeUseMapper extends CrudMapper<DemNewDisagreeUse> {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/DemNewLawMapper.java

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemNewLaw;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 法律文书记录表 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-11
+ */
+public interface DemNewLawMapper extends CrudMapper<DemNewLaw> {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemNewAgreeUseService.java

@@ -0,0 +1,16 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemNewAgreeUse;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 同意投入使用信息表 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-11
+ */
+public interface DemNewAgreeUseService extends CrudService<DemNewAgreeUse> {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemNewDisagreeUseService.java

@@ -0,0 +1,16 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemNewDisagreeUse;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 不同意投入使用信息表 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-11
+ */
+public interface DemNewDisagreeUseService extends CrudService<DemNewDisagreeUse> {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemNewLawService.java

@@ -0,0 +1,19 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemNewLaw;
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.service.vo.AdLicenseStatisticVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 法律文书记录表 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-11
+ */
+public interface DemNewLawService extends CrudService<DemNewLaw> {
+    AdLicenseStatisticVO adLicenseStatistic();
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemNewAgreeUseServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.fire.service.impl;
+
+import com.usky.fire.domain.DemNewAgreeUse;
+import com.usky.fire.mapper.DemNewAgreeUseMapper;
+import com.usky.fire.service.DemNewAgreeUseService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 同意投入使用信息表 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-11
+ */
+@Service
+public class DemNewAgreeUseServiceImpl extends AbstractCrudService<DemNewAgreeUseMapper, DemNewAgreeUse> implements DemNewAgreeUseService {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemNewDisagreeUseServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.fire.service.impl;
+
+import com.usky.fire.domain.DemNewDisagreeUse;
+import com.usky.fire.mapper.DemNewDisagreeUseMapper;
+import com.usky.fire.service.DemNewDisagreeUseService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 不同意投入使用信息表 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-11
+ */
+@Service
+public class DemNewDisagreeUseServiceImpl extends AbstractCrudService<DemNewDisagreeUseMapper, DemNewDisagreeUse> implements DemNewDisagreeUseService {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemNewLawServiceImpl.java

@@ -0,0 +1,73 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.fire.domain.DemNewAgreeUse;
+import com.usky.fire.domain.DemNewDisagreeUse;
+import com.usky.fire.domain.DemNewLaw;
+import com.usky.fire.mapper.DemNewAgreeUseMapper;
+import com.usky.fire.mapper.DemNewDisagreeUseMapper;
+import com.usky.fire.mapper.DemNewLawMapper;
+import com.usky.fire.service.DemNewLawService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.fire.service.vo.AdLicenseStatisticVO;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 法律文书记录表 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-11
+ */
+@Service
+public class DemNewLawServiceImpl extends AbstractCrudService<DemNewLawMapper, DemNewLaw> implements DemNewLawService {
+    @Autowired
+    private DemNewAgreeUseMapper demNewAgreeUseMapper;
+
+    @Autowired
+    private DemNewDisagreeUseMapper demNewDisagreeUseMapper;
+
+    @Override
+    public AdLicenseStatisticVO adLicenseStatistic(){
+        AdLicenseStatisticVO statisticVO = new AdLicenseStatisticVO();
+        //承诺数
+        LambdaQueryWrapper<DemNewLaw> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.like(DemNewLaw::getCheckType,"安全检查(承诺制)")
+                .like(DemNewLaw::getDocumentTransmission,"安凭字〔2023〕");
+        int committedCount = this.count(queryWrapper);
+        //非承诺数
+        LambdaQueryWrapper<DemNewLaw> queryWrapper1 = Wrappers.lambdaQuery();
+        queryWrapper1.like(DemNewLaw::getCheckType,"安全检查（非承诺制）")
+                .like(DemNewLaw::getDocumentTransmission,"安凭字〔2023〕");
+        int uncommittedCount = this.count(queryWrapper1);
+        //受理数
+        int acceptCount = committedCount + uncommittedCount;
+        statisticVO.setAcceptNum(acceptCount);
+        statisticVO.setCommittedNum(committedCount);
+        statisticVO.setUncommittedNum(uncommittedCount);
+        //同意数
+        LambdaQueryWrapper<DemNewAgreeUse> queryWrapper2 = Wrappers.lambdaQuery();
+        queryWrapper2.like(DemNewAgreeUse::getDocument2,"安许")
+            .eq(DemNewAgreeUse::getDeleteFlag,0);
+        int agreeCount = demNewAgreeUseMapper.selectCount(queryWrapper2);
+        //不同意数
+        LambdaQueryWrapper<DemNewDisagreeUse> queryWrapper3 = Wrappers.lambdaQuery();
+        queryWrapper3.like(DemNewDisagreeUse::getDocument2,"安许不")
+                .eq(DemNewDisagreeUse::getDeleteFlag,0);
+        int disagreeCount = demNewDisagreeUseMapper.selectCount(queryWrapper3);
+        //检查数
+        int checkCount = agreeCount + disagreeCount;
+        //合格率
+        double rate = (double)agreeCount/checkCount*100;
+        statisticVO.setPassRate(rate);
+        statisticVO.setCheckNum(checkCount);
+
+        return statisticVO;
+    }
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/AdLicenseStatisticVO.java

@@ -0,0 +1,32 @@
+package com.usky.fire.service.vo;
+
+import lombok.Data;
+
+@Data
+public class AdLicenseStatisticVO {
+
+    /**
+     * 合格率
+     */
+    private Double passRate;
+
+    /**
+     * 受理数
+     */
+    private Integer acceptNum ;
+
+    /**
+     * 检查数
+     */
+    private Integer checkNum;
+
+    /**
+     * 承诺数
+     */
+    private Integer committedNum;
+
+    /**
+     * 非承诺数
+     */
+    private Integer uncommittedNum;
+}

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemNewAgreeUseMapper.xml

@@ -0,0 +1,21 @@
+<?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.usky.fire.mapper.DemNewAgreeUseMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemNewAgreeUse">
+        <id column="id" property="id" />
+        <result column="document1" property="document1" />
+        <result column="document2" property="document2" />
+        <result column="document3" property="document3" />
+        <result column="document4" property="document4" />
+        <result column="document" property="document" />
+        <result column="company_name" property="companyName" />
+        <result column="comapny_address" property="comapnyAddress" />
+        <result column="applicant_time" property="applicantTime" />
+        <result column="check_status" property="checkStatus" />
+        <result column="delete_flag" property="deleteFlag" />
+        <result column="facility_name" property="facilityName" />
+    </resultMap>
+
+</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemNewDisagreeUseMapper.xml

@@ -0,0 +1,22 @@
+<?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.usky.fire.mapper.DemNewDisagreeUseMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemNewDisagreeUse">
+        <id column="id" property="id" />
+        <result column="rescue_name" property="rescueName" />
+        <result column="document1" property="document1" />
+        <result column="document2" property="document2" />
+        <result column="document3" property="document3" />
+        <result column="document4" property="document4" />
+        <result column="document" property="document" />
+        <result column="applicant_company" property="applicantCompany" />
+        <result column="facility_name" property="facilityName" />
+        <result column="facility_address" property="facilityAddress" />
+        <result column="check_time" property="checkTime" />
+        <result column="fire_safety" property="fireSafety" />
+        <result column="delete_flag" property="deleteFlag" />
+    </resultMap>
+
+</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemNewLawMapper.xml

@@ -0,0 +1,14 @@
+<?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.usky.fire.mapper.DemNewLawMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemNewLaw">
+        <id column="id" property="id" />
+        <result column="law_name" property="lawName" />
+        <result column="document_transmission" property="documentTransmission" />
+        <result column="company_name" property="companyName" />
+        <result column="check_type" property="checkType" />
+    </resultMap>
+
+</mapper>