服务群众，巡逻防控

src/main/java/org/springblade/common/controller/ParamsConvert.java

@@ -21,6 +21,7 @@ import org.springblade.modules.mdjfxj.tjXj.entity.TjXjEntity;
 import org.springblade.modules.rhzf.fwInfo.entity.FwInfoEntity;
 import org.springblade.modules.rhzf.fwInfo.vo.RhzfSaveVO;
 import org.springblade.modules.rhzf.fwInfo.vo.SyjzryVO;
+import org.springblade.modules.rhzf.fwqz.pojo.entity.RhzfFwqzEntity;
 import org.springblade.modules.rwxffkb.vo.RwxffkbVO;
 import org.springblade.modules.sign.entity.SignEntity;
 import org.springblade.modules.sign.vo.SignVO;
@@ -30,6 +31,7 @@ import org.springblade.modules.system.vo.MjDeptVO;
 import org.springblade.modules.temDuizhao.entity.TemDuizhaoEntity;
 import org.springblade.modules.userJwd.entity.UserJwdEntity;
 import org.springblade.modules.wgr.check.entity.CheckEntity;
+import org.springblade.modules.xlfk.pojo.entity.XlfkEntity;
 import org.springblade.modules.xxy.entity.XxyEntity;
 import org.springblade.modules.yhyj.vo.YhyjParamsVO;
 
@@ -508,6 +510,19 @@ public class ParamsConvert {
 			jsonObject.putAll(params);
 			UserJwdEntity entityVo = jsonObject.toJavaObject(UserJwdEntity.class);
 			return method.invoke(proxyObject, entityVo);
+		} else if (className.equals("rhzfFwqzController") && method.getName().equals("save")) {
+			jsonObject.putAll(params);
+			RhzfFwqzEntity rhzfFwqzEntity = jsonObject.toJavaObject(RhzfFwqzEntity.class);
+			return method.invoke(proxyObject, rhzfFwqzEntity);
+		} else if (className.equals("rhzfFwqzController") && method.getName().equals("page")) {
+			Query query = new Query();
+			query.setSize(Integer.valueOf(params.get("size").toString()));
+			query.setCurrent(Integer.valueOf(params.get("current").toString()));
+			return method.invoke(proxyObject, params, query);
+		} else if (className.equals("xlfkController") && method.getName().equals("save")) {
+			jsonObject.putAll(params);
+			XlfkEntity xlfkEntity = jsonObject.toJavaObject(XlfkEntity.class);
+			return method.invoke(proxyObject, xlfkEntity);
 		}
 		return null;
 	}

src/main/java/org/springblade/modules/rhzf/fwInfo/controller/FwInfoController.java

@@ -74,6 +74,7 @@ import org.springblade.modules.rhzf.fwInfo.wrapper.FwInfoWrapper;
 import org.springblade.modules.rhzf.fwRy.entity.FwRyEntity;
 import org.springblade.modules.rhzf.fwRy.service.IFwRyService;
 import org.springblade.modules.rhzf.fwRy.vo.FwRyVO;
+import org.springblade.modules.rhzf.fwqz.service.IRhzfFwqzService;
 import org.springblade.modules.rhzf.jxcs.entity.JxcsEntity;
 import org.springblade.modules.rhzf.jxcs.service.IJxcsService;
 import org.springblade.modules.rhzf.jxcs.vo.JxcsVO;
@@ -146,6 +147,8 @@ public class FwInfoController extends BladeController {
 
 	private final IJxcsService jxcsService;
 
+	private final IRhzfFwqzService fwqzService;
+
 	private final IDictBizService dictService;
 
 	private final IRegionService regionService;
@@ -962,6 +965,10 @@ public class FwInfoController extends BladeController {
 			}
 			jxcsService.saveBatch(jxcsList);
 		}
+		if (null != rhzfSaveVO.getFwqz()) {
+			// 保存
+			fwqzService.saveOrUpdate(rhzfSaveVO.getFwqz());
+		}
 		return R.data(fwInfo);
 	}
 
@@ -1423,6 +1430,16 @@ public class FwInfoController extends BladeController {
 		List<ZdVO> gsrcjyqk = dictService.getDictList(code);
 		data.setGsrcjyqk(gsrcjyqk);
 
+		code = "smfwlx"; // 上门服务类型
+		List<ZdVO> smfwlx = dictService.getDictList(code);
+		data.setSmfwlx(smfwlx);
+		code = "wtfwlx"; // 委托服务类型
+		List<ZdVO> wtfwlx = dictService.getDictList(code);
+		data.setWtfwlx(wtfwlx);
+		code = "yyfwlx"; // 预约服务类型
+		List<ZdVO> yyfwlx = dictService.getDictList(code);
+		data.setYyfwlx(yyfwlx);
+
 		List<XzqhVO> cityList = regionService.getCity("22");
 		for (XzqhVO city : cityList) {
 			String[] area = regionService.getArea(city.getCode());

src/main/java/org/springblade/modules/rhzf/fwInfo/vo/RhzfSaveVO.java

@@ -2,6 +2,8 @@ package org.springblade.modules.rhzf.fwInfo.vo;
 
 import lombok.Data;
 import org.springblade.modules.rhzf.fwFz.entity.FwFzEntity;
+import org.springblade.modules.rhzf.fwqz.pojo.entity.RhzfFwqzEntity;
+import org.springblade.modules.rhzf.fwqz.pojo.vo.RhzfFwqzVO;
 import org.springblade.modules.rhzf.jxcs.vo.JxcsVO;
 
 import java.util.Date;
@@ -144,4 +146,8 @@ public class RhzfSaveVO {
 	 * 九小场所列表
 	 */
 	private List<JxcsVO> jxcsList;
+	/**
+	 * 服务群众
+	 */
+	private RhzfFwqzEntity fwqz;
 }

src/main/java/org/springblade/modules/rhzf/fwqz/controller/RhzfFwqzController.java

@@ -0,0 +1,147 @@
+package org.springblade.modules.rhzf.fwqz.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.annotation.PreAuth;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.rhzf.fwqz.excel.RhzfFwqzExcel;
+import org.springblade.modules.rhzf.fwqz.pojo.entity.RhzfFwqzEntity;
+import org.springblade.modules.rhzf.fwqz.pojo.vo.RhzfFwqzVO;
+import org.springblade.modules.rhzf.fwqz.service.IRhzfFwqzService;
+import org.springblade.modules.rhzf.fwqz.wrapper.RhzfFwqzWrapper;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.service.IDeptService;
+import org.springframework.web.bind.annotation.*;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.RoleConstant;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 入户走访_服务群众 控制器
+ *
+ * @author BladeX
+ * @since 2024-10-31
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/rhzfFwqz")
+@Api(value = "入户走访_服务群众", tags = "入户走访_服务群众接口")
+public class RhzfFwqzController extends BladeController {
+
+	private final IRhzfFwqzService rhzfFwqzService;
+
+	private final IDeptService deptService;
+
+	/**
+	 * 入户走访_服务群众 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes  = "传入rhzfFwqz")
+	public R<RhzfFwqzVO> detail(RhzfFwqzEntity rhzfFwqz) {
+		RhzfFwqzEntity detail = rhzfFwqzService.getOne(Condition.getQueryWrapper(rhzfFwqz));
+		return R.data(RhzfFwqzWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 入户走访_服务群众 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes  = "传入rhzfFwqz")
+	public R<IPage<RhzfFwqzVO>> list(@RequestParam Map<String, Object> rhzfFwqz, Query query) {
+		IPage<RhzfFwqzEntity> pages = rhzfFwqzService.page(Condition.getPage(query), Condition.getQueryWrapper(rhzfFwqz, RhzfFwqzEntity.class));
+		return R.data(RhzfFwqzWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 入户走访_服务群众 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes  = "传入rhzfFwqz")
+	public R<IPage<RhzfFwqzVO>> page(@RequestParam Map<String, Object> params, Query query) {
+		Dept dept = deptService.getById(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
+		if (dept.getDeptCategory() == 7) {
+			params.put("pcsId", dept.getParentId());
+		} else {
+			params.put("deptId", AuthUtil.getDeptId());
+		}
+		IPage<RhzfFwqzVO> pages = rhzfFwqzService.selectRhzfFwqzPage(Condition.getPage(query), params);
+		return R.data(pages);
+	}
+
+	/**
+	 * 入户走访_服务群众 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes  = "传入rhzfFwqz")
+	public R save(@Valid @RequestBody RhzfFwqzEntity rhzfFwqz) {
+		return R.status(rhzfFwqzService.save(rhzfFwqz));
+	}
+
+	/**
+	 * 入户走访_服务群众 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes  = "传入rhzfFwqz")
+	public R update(@Valid @RequestBody RhzfFwqzEntity rhzfFwqz) {
+		return R.status(rhzfFwqzService.updateById(rhzfFwqz));
+	}
+
+	/**
+	 * 入户走访_服务群众 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes  = "传入rhzfFwqz")
+	public R submit(@Valid @RequestBody RhzfFwqzEntity rhzfFwqz) {
+		return R.status(rhzfFwqzService.saveOrUpdate(rhzfFwqz));
+	}
+
+	/**
+	 * 入户走访_服务群众 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes  = "传入ids")
+	public R remove(@RequestParam String ids) {
+		return R.status(rhzfFwqzService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 导出数据
+	 */
+	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+	@GetMapping("/export-rhzfFwqz")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "导出数据", notes  = "传入rhzfFwqz")
+	public void exportRhzfFwqz(@RequestParam Map<String, Object> rhzfFwqz, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<RhzfFwqzEntity> queryWrapper = Condition.getQueryWrapper(rhzfFwqz, RhzfFwqzEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(RhzfFwqzEntity::getTenantId, bladeUser.getTenantId());
+		//}
+		//queryWrapper.lambda().eq(RhzfFwqzEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<RhzfFwqzExcel> list = rhzfFwqzService.exportRhzfFwqz(queryWrapper);
+		ExcelUtil.export(response, "入户走访_服务群众数据" + DateUtil.time(), "入户走访_服务群众数据表", list, RhzfFwqzExcel.class);
+	}
+
+}

src/main/java/org/springblade/modules/rhzf/fwqz/excel/RhzfFwqzExcel.java

@@ -0,0 +1,98 @@
+package org.springblade.modules.rhzf.fwqz.excel;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+
+/**
+ * 入户走访_服务群众 Excel实体类
+ *
+ * @author BladeX
+ * @since 2024-10-31
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class RhzfFwqzExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 关联rhzf_fw_info表id
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("关联rhzf_fw_info表id")
+	private Long fwId;
+	/**
+	 * 地址编码
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("地址编码")
+	private String dzbm;
+	/**
+	 * 服务类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("服务类型")
+	private String fwlx;
+	/**
+	 * 委托人/办理人 姓名
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("委托人/办理人 姓名")
+	private String xm;
+	/**
+	 * 委托人/办理人 身份证号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("委托人/办理人 身份证号")
+	private String sfzh;
+	/**
+	 * 办理业务
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("办理业务")
+	private String blyw;
+	/**
+	 * 受委托人姓名
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("受委托人姓名")
+	private String swtrxm;
+	/**
+	 * 受委托人身份证号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("受委托人身份证号")
+	private String swtrsfzh;
+	/**
+	 * 附件
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("附件")
+	private String fj;
+	/**
+	 * 上门原因
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("上门原因")
+	private String smyy;
+	/**
+	 * 预约地点
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预约地点")
+	private String yydd;
+	/**
+	 * 预约时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预约时间")
+	private String yysj;
+
+}

src/main/java/org/springblade/modules/rhzf/fwqz/mapper/RhzfFwqzMapper.java

@@ -0,0 +1,39 @@
+package org.springblade.modules.rhzf.fwqz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.modules.rhzf.fwqz.excel.RhzfFwqzExcel;
+import org.springblade.modules.rhzf.fwqz.pojo.entity.RhzfFwqzEntity;
+import org.springblade.modules.rhzf.fwqz.pojo.vo.RhzfFwqzVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 入户走访_服务群众 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2024-10-31
+ */
+public interface RhzfFwqzMapper extends BaseMapper<RhzfFwqzEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page 分页参数
+	 * @param params 查询参数
+	 * @return List<RhzfFwqzVO>
+	 */
+	List<RhzfFwqzVO> selectRhzfFwqzPage(IPage page, @Param("params") Map<String, Object> params);
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<RhzfFwqzExcel>
+	 */
+	List<RhzfFwqzExcel> exportRhzfFwqz(@Param("ew") Wrapper<RhzfFwqzEntity> queryWrapper);
+
+}

src/main/java/org/springblade/modules/rhzf/fwqz/mapper/RhzfFwqzMapper.xml

@@ -0,0 +1,37 @@
+<?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="org.springblade.modules.rhzf.fwqz.mapper.RhzfFwqzMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="rhzfFwqzResultMap" type="org.springblade.modules.rhzf.fwqz.pojo.entity.RhzfFwqzEntity">
+        <result column="fw_id" property="fwId"/>
+        <result column="dzbm" property="dzbm"/>
+        <result column="fwlx" property="fwlx"/>
+        <result column="xm" property="xm"/>
+        <result column="sfzh" property="sfzh"/>
+        <result column="blyw" property="blyw"/>
+        <result column="swtrxm" property="swtrxm"/>
+        <result column="swtrsfzh" property="swtrsfzh"/>
+        <result column="fj" property="fj"/>
+        <result column="smyy" property="smyy"/>
+        <result column="yydd" property="yydd"/>
+        <result column="yysj" property="yysj"/>
+    </resultMap>
+
+    <select id="selectRhzfFwqzPage" resultMap="rhzfFwqzResultMap">
+        SELECT
+            rf.*
+        FROM
+            jdrh.rhzf_fwqz rf
+        LEFT JOIN jdrh.blade_dept bd ON bd.id = rf.create_dept
+        WHERE
+            rf.is_deleted = 0
+        AND rf.fwlx = #{params.fwlx}
+        AND (bd.parent_id = #{params.pcsId} :: int8 OR bd.ancestors LIKE '%' || #{params.deptId} || '%')
+    </select>
+
+    <select id="exportRhzfFwqz" resultType="org.springblade.modules.rhzf.fwqz.excel.RhzfFwqzExcel">
+        SELECT * FROM rhzf_fwqz ${ew.customSqlSegment}
+    </select>
+
+</mapper>

src/main/java/org/springblade/modules/rhzf/fwqz/pojo/dto/RhzfFwqzDTO.java

@@ -0,0 +1,18 @@
+package org.springblade.modules.rhzf.fwqz.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.rhzf.fwqz.pojo.entity.RhzfFwqzEntity;
+
+/**
+ * 入户走访_服务群众 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2024-10-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RhzfFwqzDTO extends RhzfFwqzEntity {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/modules/rhzf/fwqz/pojo/entity/RhzfFwqzEntity.java

@@ -0,0 +1,86 @@
+package org.springblade.modules.rhzf.fwqz.pojo.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 入户走访_服务群众 实体类
+ *
+ * @author BladeX
+ * @since 2024-10-31
+ */
+@Data
+@TableName("jdrh.rhzf_fwqz")
+@EqualsAndHashCode(callSuper = true)
+public class RhzfFwqzEntity extends BaseEntity {
+
+	/**
+	 * 关联rhzf_fw_info表id
+	 */
+	@ApiModelProperty(value = "关联rhzf_fw_info表id")
+	private Long fwId;
+	/**
+	 * 地址编码
+	 */
+	@ApiModelProperty(value = "地址编码")
+	private String dzbm;
+	/**
+	 * 服务类型
+	 */
+	@ApiModelProperty(value = "服务类型")
+	private String fwlx;
+	/**
+	 * 委托人/办理人 姓名
+	 */
+	@ApiModelProperty(value = "委托人/办理人 姓名")
+	private String xm;
+	/**
+	 * 委托人/办理人 身份证号
+	 */
+	@ApiModelProperty(value = "委托人/办理人 身份证号")
+	private String sfzh;
+	/**
+	 * 委托人/办理人 联系电话
+	 */
+	@ApiModelProperty(value = "委托人/办理人 联系电话")
+	private String lxdh;
+	/**
+	 * 办理业务
+	 */
+	@ApiModelProperty(value = "办理业务")
+	private String blyw;
+	/**
+	 * 受委托人姓名
+	 */
+	@ApiModelProperty(value = "受委托人姓名")
+	private String swtrxm;
+	/**
+	 * 受委托人身份证号
+	 */
+	@ApiModelProperty(value = "受委托人身份证号")
+	private String swtrsfzh;
+	/**
+	 * 附件
+	 */
+	@ApiModelProperty(value = "附件")
+	private String fj;
+	/**
+	 * 上门原因
+	 */
+	@ApiModelProperty(value = "上门原因")
+	private String smyy;
+	/**
+	 * 预约地点
+	 */
+	@ApiModelProperty(value = "预约地点")
+	private String yydd;
+	/**
+	 * 预约时间
+	 */
+	@ApiModelProperty(value = "预约时间")
+	private String yysj;
+
+}

src/main/java/org/springblade/modules/rhzf/fwqz/pojo/vo/RhzfFwqzVO.java

@@ -0,0 +1,18 @@
+package org.springblade.modules.rhzf.fwqz.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.rhzf.fwqz.pojo.entity.RhzfFwqzEntity;
+
+/**
+ * 入户走访_服务群众 视图实体类
+ *
+ * @author BladeX
+ * @since 2024-10-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RhzfFwqzVO extends RhzfFwqzEntity {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/modules/rhzf/fwqz/service/IRhzfFwqzService.java

@@ -0,0 +1,37 @@
+package org.springblade.modules.rhzf.fwqz.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.rhzf.fwqz.excel.RhzfFwqzExcel;
+import org.springblade.modules.rhzf.fwqz.pojo.entity.RhzfFwqzEntity;
+import org.springblade.modules.rhzf.fwqz.pojo.vo.RhzfFwqzVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 入户走访_服务群众 服务类
+ *
+ * @author BladeX
+ * @since 2024-10-31
+ */
+public interface IRhzfFwqzService extends BaseService<RhzfFwqzEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page 分页参数
+	 * @param rhzfFwqz 查询参数
+	 * @return IPage<RhzfFwqzVO>
+	 */
+	IPage<RhzfFwqzVO> selectRhzfFwqzPage(IPage<RhzfFwqzVO> page, Map<String, Object> params);
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<RhzfFwqzExcel>
+	 */
+	List<RhzfFwqzExcel> exportRhzfFwqz(Wrapper<RhzfFwqzEntity> queryWrapper);
+
+}

src/main/java/org/springblade/modules/rhzf/fwqz/service/impl/RhzfFwqzServiceImpl.java

@@ -0,0 +1,38 @@
+package org.springblade.modules.rhzf.fwqz.service.impl;
+
+import org.springblade.modules.rhzf.fwqz.excel.RhzfFwqzExcel;
+import org.springblade.modules.rhzf.fwqz.mapper.RhzfFwqzMapper;
+import org.springblade.modules.rhzf.fwqz.pojo.entity.RhzfFwqzEntity;
+import org.springblade.modules.rhzf.fwqz.pojo.vo.RhzfFwqzVO;
+import org.springblade.modules.rhzf.fwqz.service.IRhzfFwqzService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 入户走访_服务群众 服务实现类
+ *
+ * @author BladeX
+ * @since 2024-10-31
+ */
+@Service
+public class RhzfFwqzServiceImpl extends BaseServiceImpl<RhzfFwqzMapper, RhzfFwqzEntity> implements IRhzfFwqzService {
+
+	@Override
+	public IPage<RhzfFwqzVO> selectRhzfFwqzPage(IPage<RhzfFwqzVO> page, Map<String, Object> params) {
+		return page.setRecords(baseMapper.selectRhzfFwqzPage(page, params));
+	}
+
+	@Override
+	public List<RhzfFwqzExcel> exportRhzfFwqz(Wrapper<RhzfFwqzEntity> queryWrapper) {
+		List<RhzfFwqzExcel> rhzfFwqzList = baseMapper.exportRhzfFwqz(queryWrapper);
+		//rhzfFwqzList.forEach(rhzfFwqz -> {
+		//	rhzfFwqz.setTypeName(DictCache.getValue(DictEnum.YES_NO, RhzfFwqzEntity.getType()));
+		//});
+		return rhzfFwqzList;
+	}
+
+}

src/main/java/org/springblade/modules/rhzf/fwqz/wrapper/RhzfFwqzWrapper.java

@@ -0,0 +1,34 @@
+package org.springblade.modules.rhzf.fwqz.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.modules.rhzf.fwqz.pojo.entity.RhzfFwqzEntity;
+import org.springblade.modules.rhzf.fwqz.pojo.vo.RhzfFwqzVO;
+
+import java.util.Objects;
+
+/**
+ * 入户走访_服务群众 包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2024-10-31
+ */
+public class RhzfFwqzWrapper extends BaseEntityWrapper<RhzfFwqzEntity, RhzfFwqzVO>  {
+
+	public static RhzfFwqzWrapper build() {
+		return new RhzfFwqzWrapper();
+ 	}
+
+	@Override
+	public RhzfFwqzVO entityVO(RhzfFwqzEntity rhzfFwqz) {
+		RhzfFwqzVO rhzfFwqzVO = Objects.requireNonNull(BeanUtil.copyProperties(rhzfFwqz, RhzfFwqzVO.class));
+
+		//User createUser = UserCache.getUser(rhzfFwqz.getCreateUser());
+		//User updateUser = UserCache.getUser(rhzfFwqz.getUpdateUser());
+		//rhzfFwqzVO.setCreateUserName(createUser.getName());
+		//rhzfFwqzVO.setUpdateUserName(updateUser.getName());
+
+		return rhzfFwqzVO;
+	}
+
+}

src/main/java/org/springblade/modules/system/vo/RhzfZdVO.java

@@ -69,4 +69,10 @@ public class RhzfZdVO {
 	private List<ZdVO> gsjyms;
 
 	private List<ZdVO> gsrcjyqk;
+
+	private List<ZdVO> smfwlx;
+
+	private List<ZdVO> wtfwlx;
+
+	private List<ZdVO> yyfwlx;
 }

src/main/java/org/springblade/modules/xlfk/controller/XlfkController.java

@@ -0,0 +1,147 @@
+package org.springblade.modules.xlfk.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.annotation.PreAuth;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.service.IDeptService;
+import org.springblade.modules.xlfk.excel.XlfkExcel;
+import org.springblade.modules.xlfk.pojo.entity.XlfkEntity;
+import org.springblade.modules.xlfk.pojo.vo.XlfkVO;
+import org.springblade.modules.xlfk.service.IXlfkService;
+import org.springblade.modules.xlfk.wrapper.XlfkWrapper;
+import org.springframework.web.bind.annotation.*;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.RoleConstant;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 巡逻防控 控制器
+ *
+ * @author BladeX
+ * @since 2024-11-06
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/xlfk")
+@Api(value = "巡逻防控", tags = "巡逻防控接口")
+public class XlfkController extends BladeController {
+
+	private final IXlfkService xlfkService;
+
+	private final IDeptService deptService;
+
+	/**
+	 * 巡逻防控 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes  = "传入xlfk")
+	public R<XlfkVO> detail(XlfkEntity xlfk) {
+		XlfkEntity detail = xlfkService.getOne(Condition.getQueryWrapper(xlfk));
+		return R.data(XlfkWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 巡逻防控 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes  = "传入xlfk")
+	public R<IPage<XlfkVO>> list(@RequestParam Map<String, Object> xlfk, Query query) {
+		IPage<XlfkEntity> pages = xlfkService.page(Condition.getPage(query), Condition.getQueryWrapper(xlfk, XlfkEntity.class));
+		return R.data(XlfkWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 巡逻防控 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes  = "传入xlfk")
+	public R<IPage<XlfkVO>> page(@RequestParam Map<String, Object> params, Query query) {
+		Dept dept = deptService.getById(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
+		if (dept.getDeptCategory() == 7) {
+			params.put("pcsId", dept.getParentId());
+		} else {
+			params.put("deptId", AuthUtil.getDeptId());
+		}
+		IPage<XlfkVO> pages = xlfkService.selectXlfkPage(Condition.getPage(query), params);
+		return R.data(pages);
+	}
+
+	/**
+	 * 巡逻防控 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes  = "传入xlfk")
+	public R save(@Valid @RequestBody XlfkEntity xlfk) {
+		return R.status(xlfkService.save(xlfk));
+	}
+
+	/**
+	 * 巡逻防控 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes  = "传入xlfk")
+	public R update(@Valid @RequestBody XlfkEntity xlfk) {
+		return R.status(xlfkService.updateById(xlfk));
+	}
+
+	/**
+	 * 巡逻防控 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes  = "传入xlfk")
+	public R submit(@Valid @RequestBody XlfkEntity xlfk) {
+		return R.status(xlfkService.saveOrUpdate(xlfk));
+	}
+
+	/**
+	 * 巡逻防控 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes  = "传入ids")
+	public R remove(@RequestParam String ids) {
+		return R.status(xlfkService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 导出数据
+	 */
+	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+	@GetMapping("/export-xlfk")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "导出数据", notes  = "传入xlfk")
+	public void exportXlfk(@RequestParam Map<String, Object> xlfk, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<XlfkEntity> queryWrapper = Condition.getQueryWrapper(xlfk, XlfkEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(XlfkEntity::getTenantId, bladeUser.getTenantId());
+		//}
+		//queryWrapper.lambda().eq(XlfkEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<XlfkExcel> list = xlfkService.exportXlfk(queryWrapper);
+		ExcelUtil.export(response, "巡逻防控数据" + DateUtil.time(), "巡逻防控数据表", list, XlfkExcel.class);
+	}
+
+}

src/main/java/org/springblade/modules/xlfk/excel/XlfkExcel.java

@@ -0,0 +1,58 @@
+package org.springblade.modules.xlfk.excel;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+
+/**
+ * 巡逻防控 Excel实体类
+ *
+ * @author BladeX
+ * @since 2024-11-06
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class XlfkExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 巡逻路线
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("巡逻路线")
+	private String xllx;
+	/**
+	 * 巡逻里程数
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("巡逻里程数")
+	private String xllcs;
+	/**
+	 * 巡逻开始时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("巡逻开始时间")
+	private LocalDateTime startTime;
+	/**
+	 * 巡逻结束时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("巡逻结束时间")
+	private LocalDateTime endTime;
+	/**
+	 * 巡逻照片
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("巡逻照片")
+	private String zp;
+
+}

src/main/java/org/springblade/modules/xlfk/mapper/XlfkMapper.java

@@ -0,0 +1,39 @@
+package org.springblade.modules.xlfk.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.modules.xlfk.excel.XlfkExcel;
+import org.springblade.modules.xlfk.pojo.entity.XlfkEntity;
+import org.springblade.modules.xlfk.pojo.vo.XlfkVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 巡逻防控 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2024-11-06
+ */
+public interface XlfkMapper extends BaseMapper<XlfkEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page 分页参数
+	 * @param params 查询参数
+	 * @return List<XlfkVO>
+	 */
+	List<XlfkVO> selectXlfkPage(IPage page, @Param("params") Map<String, Object> params);
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<XlfkExcel>
+	 */
+	List<XlfkExcel> exportXlfk(@Param("ew") Wrapper<XlfkEntity> queryWrapper);
+
+}

src/main/java/org/springblade/modules/xlfk/mapper/XlfkMapper.xml

@@ -0,0 +1,29 @@
+<?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="org.springblade.modules.xlfk.mapper.XlfkMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="xlfkResultMap" type="org.springblade.modules.xlfk.pojo.entity.XlfkEntity">
+        <result column="xllx" property="xllx"/>
+        <result column="xllcs" property="xllcs"/>
+        <result column="start_time" property="startTime"/>
+        <result column="end_time" property="endTime"/>
+        <result column="zp" property="zp"/>
+    </resultMap>
+
+    <select id="selectXlfkPage" resultMap="xlfkResultMap">
+        SELECT
+            *
+        FROM
+            jdrh.xlfk xl
+        LEFT JOIN jdrh.blade_dept bd ON bd.id = xl.create_dept
+        WHERE
+            xl.is_deleted = 0
+          AND (bd.parent_id = #{params.pcsId} :: int8 OR bd.ancestors LIKE '%' || #{params.deptId} || '%')
+    </select>
+
+    <select id="exportXlfk" resultType="org.springblade.modules.xlfk.excel.XlfkExcel">
+        SELECT * FROM xlfk ${ew.customSqlSegment}
+    </select>
+
+</mapper>

src/main/java/org/springblade/modules/xlfk/pojo/dto/XlfkDTO.java

@@ -0,0 +1,18 @@
+package org.springblade.modules.xlfk.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.xlfk.pojo.entity.XlfkEntity;
+
+/**
+ * 巡逻防控 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2024-11-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class XlfkDTO extends XlfkEntity {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/modules/xlfk/pojo/entity/XlfkEntity.java

@@ -0,0 +1,47 @@
+package org.springblade.modules.xlfk.pojo.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 巡逻防控 实体类
+ *
+ * @author BladeX
+ * @since 2024-11-06
+ */
+@Data
+@TableName("xlfk")
+@EqualsAndHashCode(callSuper = true)
+public class XlfkEntity extends BaseEntity {
+
+	/**
+	 * 巡逻路线
+	 */
+	@ApiModelProperty(value = "巡逻路线")
+	private String xllx;
+	/**
+	 * 巡逻里程数
+	 */
+	@ApiModelProperty(value = "巡逻里程数")
+	private String xllcs;
+	/**
+	 * 巡逻开始时间
+	 */
+	@ApiModelProperty(value = "巡逻开始时间")
+	private LocalDateTime startTime;
+	/**
+	 * 巡逻结束时间
+	 */
+	@ApiModelProperty(value = "巡逻结束时间")
+	private LocalDateTime endTime;
+	/**
+	 * 巡逻照片
+	 */
+	@ApiModelProperty(value = "巡逻照片")
+	private String zp;
+
+}

src/main/java/org/springblade/modules/xlfk/pojo/vo/XlfkVO.java

@@ -0,0 +1,19 @@
+package org.springblade.modules.xlfk.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.xlfk.pojo.entity.XlfkEntity;
+
+
+/**
+ * 巡逻防控 视图实体类
+ *
+ * @author BladeX
+ * @since 2024-11-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class XlfkVO extends XlfkEntity {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/modules/xlfk/service/IXlfkService.java

@@ -0,0 +1,37 @@
+package org.springblade.modules.xlfk.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.xlfk.excel.XlfkExcel;
+import org.springblade.modules.xlfk.pojo.entity.XlfkEntity;
+import org.springblade.modules.xlfk.pojo.vo.XlfkVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 巡逻防控 服务类
+ *
+ * @author BladeX
+ * @since 2024-11-06
+ */
+public interface IXlfkService extends BaseService<XlfkEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page 分页参数
+	 * @param params 查询参数
+	 * @return IPage<XlfkVO>
+	 */
+	IPage<XlfkVO> selectXlfkPage(IPage<XlfkVO> page, Map<String, Object> params);
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<XlfkExcel>
+	 */
+	List<XlfkExcel> exportXlfk(Wrapper<XlfkEntity> queryWrapper);
+
+}

src/main/java/org/springblade/modules/xlfk/service/impl/XlfkServiceImpl.java

@@ -0,0 +1,39 @@
+package org.springblade.modules.xlfk.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.xlfk.excel.XlfkExcel;
+import org.springblade.modules.xlfk.mapper.XlfkMapper;
+import org.springblade.modules.xlfk.pojo.entity.XlfkEntity;
+import org.springblade.modules.xlfk.pojo.vo.XlfkVO;
+import org.springblade.modules.xlfk.service.IXlfkService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 巡逻防控 服务实现类
+ *
+ * @author BladeX
+ * @since 2024-11-06
+ */
+@Service
+public class XlfkServiceImpl extends BaseServiceImpl<XlfkMapper, XlfkEntity> implements IXlfkService {
+
+	@Override
+	public IPage<XlfkVO> selectXlfkPage(IPage<XlfkVO> page, Map<String, Object> params) {
+		return page.setRecords(baseMapper.selectXlfkPage(page, params));
+	}
+
+	@Override
+	public List<XlfkExcel> exportXlfk(Wrapper<XlfkEntity> queryWrapper) {
+		List<XlfkExcel> xlfkList = baseMapper.exportXlfk(queryWrapper);
+		//xlfkList.forEach(xlfk -> {
+		//	xlfk.setTypeName(DictCache.getValue(DictEnum.YES_NO, XlfkEntity.getType()));
+		//});
+		return xlfkList;
+	}
+
+}

src/main/java/org/springblade/modules/xlfk/wrapper/XlfkWrapper.java

@@ -0,0 +1,34 @@
+package org.springblade.modules.xlfk.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.modules.xlfk.pojo.entity.XlfkEntity;
+import org.springblade.modules.xlfk.pojo.vo.XlfkVO;
+
+import java.util.Objects;
+
+/**
+ * 巡逻防控 包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2024-11-06
+ */
+public class XlfkWrapper extends BaseEntityWrapper<XlfkEntity, XlfkVO> {
+
+	public static XlfkWrapper build() {
+		return new XlfkWrapper();
+	}
+
+	@Override
+	public XlfkVO entityVO(XlfkEntity xlfk) {
+		XlfkVO xlfkVO = Objects.requireNonNull(BeanUtil.copyProperties(xlfk, XlfkVO.class));
+
+		//User createUser = UserCache.getUser(xlfk.getCreateUser());
+		//User updateUser = UserCache.getUser(xlfk.getUpdateUser());
+		//xlfkVO.setCreateUserName(createUser.getName());
+		//xlfkVO.setUpdateUserName(updateUser.getName());
+
+		return xlfkVO;
+	}
+
+}