执法依据

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java

@@ -87,4 +87,27 @@ public class AppSystemController extends BaseController {
         }
         return ZDResponse.success("查询成功",list);
     }
+
+    @GetMapping("/listAApp")
+    @ResponseBody
+    public ZDResponse listAApp(User user) {
+        List<User> list = userService.selectUserList(user);
+        // 查询出职务
+        for (User userData : list) {
+            List<PostBean> postBeanList = postApi.selectPostsByUserId(userData.getUserId());
+            ArrayList<Post> postList = new ArrayList<>();
+
+            // 职务bean转成实体
+            for (PostBean postBean : postBeanList) {
+                Post post = new Post();
+                BeanUtil.copyProperties(postBean, post);
+                postList.add(post);
+            }
+
+            if (!postList.isEmpty()) {
+                userData.setPostList(postList);
+            }
+        }
+        return ZDResponse.success("查询成功",list);
+    }
 }

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppZqyjjdm137344Controller.java

@@ -0,0 +1,42 @@
+package com.zdxt.app.controller;
+
+import com.zdxt.code.domain.LinkageDict;
+import com.zdxt.code.domain.Zqyjjdm137344;
+import com.zdxt.code.service.ILinkageDictService;
+import com.zdxt.code.service.IZqyjjdm137344Service;
+import com.zdxt.common.ZDResponse;
+import com.zdxt.common.Ztree;
+import com.zdxt.common.controller.BaseController;
+import com.zdxt.common.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 联动字典Controller
+ * 
+ * @author ruoyi
+ * @date 2024-04-12
+ */
+@Controller
+@RequestMapping("/app/zqyjjdm")
+public class AppZqyjjdm137344Controller extends BaseController
+{
+
+    @Autowired
+    private IZqyjjdm137344Service iZqyjjdm137344Service;
+
+    /**
+     * 查询联动字典列表
+     */
+    @GetMapping("/list/{searchValue}")
+    @ResponseBody
+    public List<Zqyjjdm137344> list(@PathVariable String searchValue)
+    {
+        List<Zqyjjdm137344> list = iZqyjjdm137344Service.selectZqyjjdmList(searchValue);
+        return list;
+    }
+}

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zqyjjdm137344.java

@@ -0,0 +1,188 @@
+package com.zdxt.code.domain;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.zdxt.common.BaseDomain;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 联动字典对象 linkage_dict
+ * 
+ * @author ruoyi
+ * @date 2024-04-12
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Zqyjjdm137344 {
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private String id;
+    /** 节 */
+    private String gistSection;
+    /** 职权ID */
+    private String powerId;
+    /** 依据编号 */
+    private String gistCode;
+    /** 法律名称 */
+    private String lawName;
+    /** 依据分类 */
+    private String gistType;
+    /** 编 */
+    private String gistSeries;
+    /** 章 */
+    private String gistChapter;
+    /** 内容 */
+    private String content;
+    /** 目 */
+    private String gistCatalog;
+    /** 项 */
+    private String gistItem;
+    /** 款 */
+    private String gistFund;
+    /** 条 */
+    private String gistStrip;
+    /** 单位标识 */
+    private String dataPlace;
+    /** 系统内部INS */
+    private String ins;
+    /** 更新状态 */
+    private String updatestatus;
+    /** 更新时间 */
+    private String updatetime;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getGistSection() {
+        return gistSection;
+    }
+
+    public void setGistSection(String gistSection) {
+        this.gistSection = gistSection;
+    }
+
+    public String getPowerId() {
+        return powerId;
+    }
+
+    public void setPowerId(String powerId) {
+        this.powerId = powerId;
+    }
+
+    public String getGistCode() {
+        return gistCode;
+    }
+
+    public void setGistCode(String gistCode) {
+        this.gistCode = gistCode;
+    }
+
+    public String getLawName() {
+        return lawName;
+    }
+
+    public void setLawName(String lawName) {
+        this.lawName = lawName;
+    }
+
+    public String getGistType() {
+        return gistType;
+    }
+
+    public void setGistType(String gistType) {
+        this.gistType = gistType;
+    }
+
+    public String getGistSeries() {
+        return gistSeries;
+    }
+
+    public void setGistSeries(String gistSeries) {
+        this.gistSeries = gistSeries;
+    }
+
+    public String getGistChapter() {
+        return gistChapter;
+    }
+
+    public void setGistChapter(String gistChapter) {
+        this.gistChapter = gistChapter;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getGistCatalog() {
+        return gistCatalog;
+    }
+
+    public void setGistCatalog(String gistCatalog) {
+        this.gistCatalog = gistCatalog;
+    }
+
+    public String getGistItem() {
+        return gistItem;
+    }
+
+    public void setGistItem(String gistItem) {
+        this.gistItem = gistItem;
+    }
+
+    public String getGistFund() {
+        return gistFund;
+    }
+
+    public void setGistFund(String gistFund) {
+        this.gistFund = gistFund;
+    }
+
+    public String getGistStrip() {
+        return gistStrip;
+    }
+
+    public void setGistStrip(String gistStrip) {
+        this.gistStrip = gistStrip;
+    }
+
+    public String getDataPlace() {
+        return dataPlace;
+    }
+
+    public void setDataPlace(String dataPlace) {
+        this.dataPlace = dataPlace;
+    }
+
+    public String getIns() {
+        return ins;
+    }
+
+    public void setIns(String ins) {
+        this.ins = ins;
+    }
+
+    public String getUpdatestatus() {
+        return updatestatus;
+    }
+
+    public void setUpdatestatus(String updatestatus) {
+        this.updatestatus = updatestatus;
+    }
+
+    public String getUpdatetime() {
+        return updatetime;
+    }
+
+    public void setUpdatetime(String updatetime) {
+        this.updatetime = updatetime;
+    }
+}

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zqyjjdm137344Mapper.java

@@ -0,0 +1,22 @@
+package com.zdxt.code.mapper;
+
+import com.zdxt.code.domain.Zqyjjdm137344;
+
+import java.util.List;
+
+/**
+ * 联动字典Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-04-12
+ */
+public interface Zqyjjdm137344Mapper
+{
+    /**
+     * 关键字查询
+     * 
+     * @param searchValue 关键字
+     * @return 集合
+     */
+    public List<Zqyjjdm137344> selectZqyjjdmList(String searchValue);
+}

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZqyjjdm137344Service.java

@@ -0,0 +1,24 @@
+package com.zdxt.code.service;
+
+import com.zdxt.code.domain.LinkageDict;
+import com.zdxt.code.domain.Zqyjjdm137344;
+import com.zdxt.common.Ztree;
+
+import java.util.List;
+
+/**
+ * 联动字典Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-04-12
+ */
+public interface IZqyjjdm137344Service
+{
+    /**
+     * 关键字查询
+     *
+     * @param searchValue 关键字
+     * @return 集合
+     */
+    public List<Zqyjjdm137344> selectZqyjjdmList(String searchValue);
+}

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java

@@ -96,6 +96,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
             DeptBean dept = deptApi.getDeptById(user.getOrganizationId());
             user.setDept(dept);
             user.setDeptId(user.getOrganizationId());
+            user.setLawOfficer(this.checkIsLawOfficer(user.getCertificateNumber()));
             return ZDResponse.success("登录成功",user);
         } catch (Exception e) {
             e.printStackTrace();

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zqyjjdm137344ServiceImpl.java

@@ -0,0 +1,39 @@
+package com.zdxt.code.service.impl;
+
+import cn.hutool.core.util.IdUtil;
+import com.zdxt.auth.dto.UserBean;
+import com.zdxt.auth.feign.UserApi;
+import com.zdxt.code.domain.LinkageDict;
+import com.zdxt.code.domain.Zqyjjdm137344;
+import com.zdxt.code.mapper.LinkageDictMapper;
+import com.zdxt.code.mapper.Zqyjjdm137344Mapper;
+import com.zdxt.code.service.ILinkageDictService;
+import com.zdxt.code.service.IZqyjjdm137344Service;
+import com.zdxt.common.Ztree;
+import com.zdxt.common.annotation.DataScope;
+import com.zdxt.common.util.Convert;
+import com.zdxt.common.util.DateUtils;
+import com.zdxt.common.util.StringUtils;
+import com.zdxt.common.util.UserConstants;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 联动字典Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-04-12
+ */
+@Service
+public class Zqyjjdm137344ServiceImpl implements IZqyjjdm137344Service
+{
+    @Autowired private Zqyjjdm137344Mapper zqyjjdm137344Mapper;
+
+    @Override
+    public List<Zqyjjdm137344> selectZqyjjdmList(String searchValue) {
+        return zqyjjdm137344Mapper.selectZqyjjdmList(searchValue);
+    }
+}

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zqyjjdm137344Mapper.xml

@@ -0,0 +1,48 @@
+<?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.zdxt.code.mapper.Zqyjjdm137344Mapper">
+    
+    <resultMap type="com.zdxt.code.domain.Zqyjjdm137344" id="ZqyjjdmResult">
+        <result property="id"    column="id"    />
+        <result property="gistSection"    column="gist_section"    />
+        <result property="powerId"    column="power_id"    />
+        <result property="gistCode"    column="gist_code"    />
+        <result property="lawName"    column="law_name"    />
+        <result property="gistType"    column="gist_type"    />
+        <result property="gistSeries"    column="gist_series"    />
+        <result property="gistChapter"    column="gist_chapter"    />
+        <result property="content"    column="content"    />
+        <result property="gistCatalog"    column="gist_catalog"    />
+        <result property="gistItem"    column="gist_item"    />
+        <result property="gistFund"    column="gist_fund"    />
+        <result property="gistStrip"    column="gist_strip"    />
+        <result property="dataPlace"    column="data_place"    />
+        <result property="ins"    column="ins"    />
+        <result property="updatestatus"    column="updatestatus"    />
+        <result property="updatetime"    column="updatetime"    />
+    </resultMap>
+
+    <sql id="selectZqyjjdmVo">
+        select id, gist_section, power_id, gist_code, law_name, gist_type, gist_series, gist_chapter, content, gist_catalog, gist_item, gist_fund, gist_strip, data_place, ins, updatestatus, updatetime from zqyjjdm137344
+    </sql>
+
+    <select id="selectZqyjjdmList" parameterType="string" resultMap="ZqyjjdmResult">
+        <include refid="selectZqyjjdmVo"/>
+        <where>
+            <if test="searchValue != null and searchValue != ''">
+                and ( CONTENTlike concat(concat('%',#{searchValue}),'%')
+                or GIST_STRIP like concat(concat('%',#{searchValue}),'%')
+                or GIST_FUND like concat(concat('%',#{searchValue}),'%')
+                or GIST_ITEM like concat(concat('%',#{searchValue}),'%')
+                or GIST_CATALOG like concat(concat('%',#{searchValue}),'%')
+                or GIST_CHAPTER like concat(concat('%',#{searchValue}),'%')
+                or GIST_SERIES like concat(concat('%',#{searchValue}),'%')
+                or LAW_NAME like concat(concat('%',#{searchValue}),'%')
+                )
+            </if>
+        </where>
+    </select>
+    
+</mapper>

lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/UserBean.java

@@ -1,5 +1,6 @@
 package com.zdxt.auth.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -17,6 +18,7 @@ import java.util.Map;
  */
 
 @ApiModel
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class UserBean implements Serializable {
 
     private static final long serialVersionUID = -8035734163527004279L;
@@ -160,6 +162,16 @@ public class UserBean implements Serializable {
     private String isMappingPerson;
     /** 人员所在部门（包括主岗和兼岗部门） */
     private String units;
+    /** 区别是否执法人员 */
+    private Boolean lawOfficer;
+
+    public Boolean getLawOfficer() {
+        return lawOfficer;
+    }
+
+    public void setLawOfficer(Boolean lawOfficer) {
+        this.lawOfficer = lawOfficer;
+    }
 
     public String getStrUserId() {
         return strUserId;