消防检查信息相关接口开发

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

@@ -71,7 +71,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude("dem_grid_memder_vice");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("dem_fire_inspect_person");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

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

@@ -0,0 +1,70 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemFireInspect;
+import com.usky.fire.domain.DemFireInspectPerson;
+import com.usky.fire.service.DemFireInspectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 消防检查 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-24
+ */
+@RestController
+@RequestMapping("/demFireInspect")
+public class DemFireInspectController {
+
+    @Autowired
+    private DemFireInspectService demFireInspectService;
+
+    /**
+     * 消防检查信息-检查计划-列表查询
+     *
+     * @param companyId 单位ID
+     * @param pageNum   当前页
+     * @param pageSize  每页条数
+     * @return
+     */
+    @GetMapping("fireInspectList")
+    public ApiResult<CommonPage<DemFireInspect>> fireInspectList(@RequestParam(value = "companyId") String companyId,
+                                                                 @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                 @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demFireInspectService.fireInspectList(companyId, pageNum, pageSize));
+    }
+
+    /**
+     * 消防检查信息-检查计划-新增
+     *
+     * @param demFireInspect
+     * @return
+     */
+    @Log(title = "消防检查信息-检查计划-新增", businessType = BusinessType.INSERT)
+    @PostMapping("addFireInspect")
+    public ApiResult<DemFireInspectPerson> addFireInspect(@RequestBody DemFireInspect demFireInspect) {
+        return ApiResult.success(demFireInspectService.addFireInspect(demFireInspect));
+    }
+
+    /**
+     * 消防检查信息-检查计划-修改
+     *
+     * @param demFireInspect
+     * @return
+     */
+    @Log(title = "消防检查信息-检查计划-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateFireInspect")
+    public ApiResult<Void> updateFireInspect(@RequestBody DemFireInspect demFireInspect) {
+        demFireInspectService.updateFireInspect(demFireInspect);
+        return ApiResult.success();
+    }
+
+}
+

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

@@ -0,0 +1,88 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemFireInspectPerson;
+import com.usky.fire.service.DemFireInspectPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 消防检查人员 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-24
+ */
+@RestController
+@RequestMapping("/demFireInspectPerson")
+public class DemFireInspectPersonController {
+
+    @Autowired
+    private DemFireInspectPersonService demFireInspectPersonService;
+
+    /**
+     * 消防检查信息-检查人员信息-列表查询
+     *
+     * @param personName     检查员名称
+     * @param personPosition 检查员职位
+     * @param id             主键ID
+     * @param pageNum        当前页
+     * @param pageSize       每页条数
+     * @return
+     */
+    @GetMapping("fireInspectPersonList")
+    public ApiResult<CommonPage<DemFireInspectPerson>> fireInspectPersonList(@RequestParam(value = "personName", required = false) String personName,
+                                                                             @RequestParam(value = "personPosition", required = false) String personPosition,
+                                                                             @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                                             @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                             @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demFireInspectPersonService.fireInspectPersonList(personName, personPosition, id, pageNum, pageSize));
+    }
+
+    /**
+     * 消防检查信息-检查人员信息-新增
+     *
+     * @param demFireInspectPerson
+     * @return
+     */
+    @Log(title = "消防检查信息-检查人员信息-新增", businessType = BusinessType.INSERT)
+    @PostMapping("addFireInspectPerson")
+    public ApiResult<Void> addFireInspectPerson(@RequestBody DemFireInspectPerson demFireInspectPerson) {
+        demFireInspectPersonService.addFireInspectPerson(demFireInspectPerson);
+        return ApiResult.success();
+    }
+
+    /**
+     * 消防检查信息-检查人员信息-修改
+     *
+     * @param demFireInspectPerson
+     * @return
+     */
+    @Log(title = "消防检查信息-检查人员信息-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateFireInspectPerson")
+    public ApiResult<Void> updateFireInspectPerson(@RequestBody DemFireInspectPerson demFireInspectPerson) {
+        demFireInspectPersonService.updateFireInspectPerson(demFireInspectPerson);
+        return ApiResult.success();
+    }
+
+
+    /**
+     * 消防检查信息-检查人员信息-删除
+     *
+     * @param id 主键ID
+     * @return
+     */
+    @Log(title = "消防检查信息-检查人员信息-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delFireInspectPerson")
+    public ApiResult<Void> delFireInspectPerson(@RequestParam(value = "id") Integer id) {
+        demFireInspectPersonService.delFireInspectPerson(id);
+        return ApiResult.success();
+    }
+
+}
+

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

@@ -0,0 +1,80 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 消防检查
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemFireInspect implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 所属单位ID
+     */
+    private String companyId;
+
+    /**
+     * 检查人员ID
+     */
+    private Integer personId;
+
+    /**
+     * 计划生成时间
+     */
+    private LocalDateTime planTime;
+
+    /**
+     * 检查结果
+     */
+    private String inspectResult;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 检查员名称
+     */
+    @TableField(exist = false)
+    private String personName;
+
+    /**
+     * 检查员职位
+     */
+    @TableField(exist = false)
+    private String personPosition;
+
+    /**
+     * 联系方式
+     */
+    @TableField(exist = false)
+    private String linkPhone;
+
+
+}

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

@@ -0,0 +1,66 @@
+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 JCB
+ * @since 2022-11-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemFireInspectPerson implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 检查员名称
+     */
+    private String personName;
+
+    /**
+     * 检查员职位
+     */
+    private String personPosition;
+
+    /**
+     * 联系方式
+     */
+    private String linkPhone;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新人
+     */
+    private String updatePerson;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemFireInspect;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 消防检查 Mapper 接口
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-24
+ */
+public interface DemFireInspectMapper extends CrudMapper<DemFireInspect> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemFireInspectPerson;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 消防检查人员 Mapper 接口
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-24
+ */
+public interface DemFireInspectPersonMapper extends CrudMapper<DemFireInspectPerson> {
+
+}

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

@@ -0,0 +1,30 @@
+package com.usky.fire.service;
+
+import com.usky.common.core.bean.CommonPage;
+import com.usky.fire.domain.DemFireInspectPerson;
+import com.usky.common.mybatis.core.CrudService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 消防检查人员 服务类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-24
+ */
+public interface DemFireInspectPersonService extends CrudService<DemFireInspectPerson> {
+
+    CommonPage<DemFireInspectPerson> fireInspectPersonList(String personName, String personPosition, Integer id, Integer pageNum, Integer pageSize);
+
+    List<DemFireInspectPerson> fireInspectPersonList(String personName, String personPosition, List<Integer> idList);
+
+    int fireInspectPersonCount(String personName, String personPosition, Integer id);
+
+    void addFireInspectPerson(DemFireInspectPerson demFireInspectPerson);
+
+    void updateFireInspectPerson(DemFireInspectPerson demFireInspectPerson);
+
+    void delFireInspectPerson(Integer id);
+}

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

@@ -0,0 +1,23 @@
+package com.usky.fire.service;
+
+import com.usky.common.core.bean.CommonPage;
+import com.usky.fire.domain.DemFireInspect;
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.domain.DemFireInspectPerson;
+
+/**
+ * <p>
+ * 消防检查 服务类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-24
+ */
+public interface DemFireInspectService extends CrudService<DemFireInspect> {
+
+    CommonPage<DemFireInspect> fireInspectList(String companyId, Integer pageNum, Integer pageSize);
+
+    DemFireInspectPerson addFireInspect(DemFireInspect demFireInspect);
+
+    void updateFireInspect(DemFireInspect demFireInspect);
+}

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

@@ -0,0 +1,92 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.fire.domain.DemFireInspectPerson;
+import com.usky.fire.mapper.DemFireInspectPersonMapper;
+import com.usky.fire.service.DemFireInspectPersonService;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 消防检查人员 服务实现类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-24
+ */
+@Service
+public class DemFireInspectPersonServiceImpl extends AbstractCrudService<DemFireInspectPersonMapper, DemFireInspectPerson> implements DemFireInspectPersonService {
+
+    @Override
+    public CommonPage<DemFireInspectPerson> fireInspectPersonList(String personName, String personPosition, Integer id, Integer pageNum, Integer pageSize) {
+        IPage<DemFireInspectPerson> page = new Page<>(pageNum, pageSize);
+        LambdaQueryWrapper<DemFireInspectPerson> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.like(StringUtils.isNotBlank(personName), DemFireInspectPerson::getPersonName, personName)
+                .like(StringUtils.isNotBlank(personPosition), DemFireInspectPerson::getPersonPosition, personPosition)
+                .eq(null != id && id != 0, DemFireInspectPerson::getId, id)
+                .orderByDesc(DemFireInspectPerson::getId);
+        page = this.page(page, queryWrapper);
+        return new CommonPage<>(page.getRecords(), page.getTotal(), pageSize, pageNum);
+    }
+
+    @Override
+    public List<DemFireInspectPerson> fireInspectPersonList(String personName, String personPosition, List<Integer> idList) {
+        LambdaQueryWrapper<DemFireInspectPerson> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.like(StringUtils.isNotBlank(personName), DemFireInspectPerson::getPersonName, personName)
+                .like(StringUtils.isNotBlank(personPosition), DemFireInspectPerson::getPersonPosition, personPosition)
+                .in(CollectionUtils.isNotEmpty(idList), DemFireInspectPerson::getId, idList)
+                .orderByDesc(DemFireInspectPerson::getId);
+        List<DemFireInspectPerson> list = this.list(queryWrapper);
+        return list;
+    }
+
+    @Override
+    public int fireInspectPersonCount(String personName, String personPosition, Integer id) {
+        LambdaQueryWrapper<DemFireInspectPerson> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.like(StringUtils.isNotBlank(personName), DemFireInspectPerson::getPersonName, personName)
+                .like(StringUtils.isNotBlank(personPosition), DemFireInspectPerson::getPersonPosition, personPosition)
+                .ne(null != id && id != 0, DemFireInspectPerson::getId, id)
+                .orderByDesc(DemFireInspectPerson::getId);
+        int count = this.count(queryWrapper);
+        return count;
+    }
+
+    @Override
+    public void addFireInspectPerson(DemFireInspectPerson demFireInspectPerson) {
+        int count = this.fireInspectPersonCount(demFireInspectPerson.getPersonName(), demFireInspectPerson.getPersonPosition(), 0);
+        if (count > 0) {
+            throw new BusinessException("检查员重复，不可添加");
+        }
+        demFireInspectPerson.setCreator(SecurityUtils.getUsername());
+        demFireInspectPerson.setCreateTime(LocalDateTime.now());
+        this.save(demFireInspectPerson);
+    }
+
+    @Override
+    public void updateFireInspectPerson(DemFireInspectPerson demFireInspectPerson) {
+        int count = this.fireInspectPersonCount(demFireInspectPerson.getPersonName(), demFireInspectPerson.getPersonPosition(), demFireInspectPerson.getId());
+        if (count > 0) {
+            throw new BusinessException("检查员重复，不可修改");
+        }
+        demFireInspectPerson.setUpdatePerson(SecurityUtils.getUsername());
+        demFireInspectPerson.setUpdateTime(LocalDateTime.now());
+        this.updateById(demFireInspectPerson);
+    }
+
+    @Override
+    public void delFireInspectPerson(Integer id) {
+        this.removeById(id);
+    }
+}

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

@@ -0,0 +1,87 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.fire.domain.DemFireInspect;
+import com.usky.fire.domain.DemFireInspectPerson;
+import com.usky.fire.mapper.DemFireInspectMapper;
+import com.usky.fire.service.DemFireInspectPersonService;
+import com.usky.fire.service.DemFireInspectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * <p>
+ * 消防检查 服务实现类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-24
+ */
+@Service
+public class DemFireInspectServiceImpl extends AbstractCrudService<DemFireInspectMapper, DemFireInspect> implements DemFireInspectService {
+
+    @Autowired
+    private DemFireInspectPersonService demFireInspectPersonService;
+
+    @Override
+    public CommonPage<DemFireInspect> fireInspectList(String companyId, Integer pageNum, Integer pageSize) {
+        IPage<DemFireInspect> page = new Page<>(pageNum, pageSize);
+        LambdaQueryWrapper<DemFireInspect> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(DemFireInspect::getCompanyId, companyId)
+                .orderByDesc(DemFireInspect::getId);
+        page = this.page(page, queryWrapper);
+        if (CollectionUtils.isNotEmpty(page.getRecords())) {
+            List<Integer> personIdList = new ArrayList<>();
+            for (int i = 0; i < page.getRecords().size(); i++) {
+                personIdList.add(page.getRecords().get(i).getPersonId());
+            }
+            List<DemFireInspectPerson> demFireInspectPeople = demFireInspectPersonService.fireInspectPersonList(null, null, personIdList);
+            for (int i = 0; i < page.getRecords().size(); i++) {
+                for (int j = 0; j < demFireInspectPeople.size(); j++) {
+                    if (page.getRecords().get(i).getPersonId() == demFireInspectPeople.get(j).getId()) {
+                        page.getRecords().get(i).setPersonName(demFireInspectPeople.get(j).getPersonName());
+                        page.getRecords().get(i).setPersonPosition(demFireInspectPeople.get(j).getPersonPosition());
+                        page.getRecords().get(i).setLinkPhone(demFireInspectPeople.get(j).getLinkPhone());
+                    }
+                }
+            }
+        }
+        return new CommonPage<>(page.getRecords(), page.getTotal(), pageSize, pageNum);
+    }
+
+    @Transactional
+    @Override
+    public DemFireInspectPerson addFireInspect(DemFireInspect demFireInspect) {
+        List<DemFireInspectPerson> list = demFireInspectPersonService.fireInspectPersonList(null, null, null);
+        int value = 0;
+        if (list.size() != 1) {
+            Random random = new Random();
+            value = random.nextInt(list.size());
+        }
+        demFireInspect.setPersonId(list.get(value).getId());
+        demFireInspect.setPlanTime(LocalDateTime.now());
+        demFireInspect.setCreator(SecurityUtils.getUsername());
+        demFireInspect.setCreateTime(LocalDateTime.now());
+        this.save(demFireInspect);
+        return list.get(value);
+    }
+
+    @Override
+    public void updateFireInspect(DemFireInspect demFireInspect) {
+        this.updateById(demFireInspect);
+    }
+
+}

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

@@ -0,0 +1,16 @@
+<?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.DemFireInspectMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemFireInspect">
+        <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
+        <result column="person_id" property="personId" />
+        <result column="plan_time" property="planTime" />
+        <result column="inspect_result" property="inspectResult" />
+        <result column="creator" property="creator" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,17 @@
+<?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.DemFireInspectPersonMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemFireInspectPerson">
+        <id column="id" property="id" />
+        <result column="person_name" property="personName" />
+        <result column="person_position" property="personPosition" />
+        <result column="link_phone" property="linkPhone" />
+        <result column="creator" property="creator" />
+        <result column="create_time" property="createTime" />
+        <result column="update_person" property="updatePerson" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+</mapper>