Merge remote-tracking branch 'origin/master'

lin

2024-04-01 a5466b1cba84d1b5eee924a3038dd095e4b82b69

Merge remote-tracking branch 'origin/master'

 src/main/java/org/springblade/common/param/ToObject.java

New file
@@ -0,0 +1,18 @@
package org.springblade.common.param;

import java.util.HashMap;
import java.util.Map;

public class ToObject {

    public static Map<String,Object> toMap(String... val){
        Map<String, Object> map = new HashMap<>();
        for (String value : val) {
            String[] split = value.split(":");
            map.put(split[0],split[1]);
        }
        return map;
    }


}

 src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java

@@ -16,15 +16,21 @@
 */
package org.springblade.modules.doorplateAddress.controller;

import cn.hutool.json.JSONUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import javax.validation.Valid;

import org.springblade.common.param.ToObject;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.log.logger.BladeLogger;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.node.ForestNodeMerger;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
@@ -51,14 +57,17 @@
public class DoorplateAddressController{

    private final IDoorplateAddressService doorplateAddressService;
    private final BladeLogger bladeLogger;

    /**
     * 门牌地址表（总台账数据） 详情
     */
    @GetMapping("/detail")
    @ApiLog("门牌地址表（总台账数据） 详情")
    @ApiOperationSupport(order = 1)
    @ApiOperation(value = "详情", notes = "传入doorplateAddress")
    public R<DoorplateAddressVO> detail(DoorplateAddressEntity doorplateAddress) {
        bladeLogger.info("blade-doorplateAddress_detail", JsonUtil.toJson(doorplateAddress));
        DoorplateAddressEntity detail = doorplateAddressService.getOne(Condition.getQueryWrapper(doorplateAddress));
        return R.data(DoorplateAddressWrapper.build().entityVO(detail));
    }
@@ -67,7 +76,9 @@
     * 门牌地址表（总台账数据） 自定义详情
     */
    @GetMapping("/getDetail")
    @ApiLog("门牌地址表（总台账数据） 自定义详情")
    public R getDetail(DoorplateAddressVO doorplateAddress) {
        bladeLogger.info("blade-doorplateAddress_getDetail", JsonUtil.toJson(doorplateAddress));
        return R.data(doorplateAddressService.getDetail(doorplateAddress));
    }

@@ -87,6 +98,7 @@
     */
    @GetMapping("/page")
    @ApiOperationSupport(order = 3)
    @ApiLog("门牌地址表（总台账数据） 自定义分页")
    @ApiOperation(value = "分页", notes = "传入doorplateAddress")
    public R<IPage<DoorplateAddressVO>> page(DoorplateAddressVO doorplateAddress, Query query) {
        IPage<DoorplateAddressVO> pages = doorplateAddressService.selectDoorplateAddressPage(Condition.getPage(query), doorplateAddress);
@@ -140,7 +152,9 @@
     * @return
     */
    @GetMapping("/getFuncList")
    @ApiLog("根据角色获取功能集合数据")
    public R getFuncList(Integer type,String roleName) {
        bladeLogger.info("blade-doorplateAddress_getFuncList", JsonUtil.toJson(ToObject.toMap("type:" + type,"roleName:"+ roleName)));
        return R.data(doorplateAddressService.getFuncList(type,roleName));
    }

@@ -150,7 +164,9 @@
     * @return
     */
    @GetMapping("/getHousesList")
    @ApiLog("获取楼盘相关集合数据")
    public R getHousesList(HouseParam houseParam) {
        bladeLogger.info("获取楼盘相关集合数据", JsonUtil.toJson(houseParam));
        return R.data(doorplateAddressService.getHousesList(houseParam));
    }

@@ -160,7 +176,9 @@
     * @return
     */
    @GetMapping("/getHouseRentInfo")
    @ApiLog("查询房屋及出租详情信息")
    public R getHouseRentInfo(String code) {
        bladeLogger.info("获取楼盘相关集合数据", JsonUtil.toJson(code));
        return R.data(doorplateAddressService.getHouseRentInfo(code));
    }

@@ -181,6 +199,7 @@
     * @param type
     * @return
     */
    @ApiLog("获取门牌地址树集合信息")
    @GetMapping("/getDoorplateAddressList")
    public R<List<DoorplateAddressVOTree>> getDoorplateAddressList(String code, String type){
        List<DoorplateAddressVOTree> list = doorplateAddressService.getDoorplateAddressList(code,type);
@@ -201,6 +220,7 @@
     * 根据参数获取地址详情
     * @return
     */
    @ApiLog("根据参数获取地址详情")
    @GetMapping("/getDoorplateAddressDetail")
    public R getDoorplateAddressDetail(DoorplateAddressVO doorplateAddressVO){
        DoorplateAddressVO detail = doorplateAddressService.getDoorplateAddressDetail(doorplateAddressVO);
@@ -260,6 +280,7 @@
     * 查询场所标准地址数据
     * @return
     */
    @ApiLog("查询场所标准地址数据")
    @GetMapping("/getPlaceList")
    public R getPlaceList(DoorplateAddressVO doorplateAddressVO,Integer size){
        return R.data(doorplateAddressService.getPlaceList(doorplateAddressVO,size));
@@ -271,6 +292,7 @@
     * @return
     */
    @GetMapping("/getHouseBuildingCode")
    @ApiLog("通过小区id 查询楼栋编码")
    public R<List<DoorplateAddressVO>> getHouseBuildingCode(String districtId) {
        List<DoorplateAddressVO> houseBuildingCode = doorplateAddressService.getHouseBuildingCode(districtId);
        return R.data(houseBuildingCode);

 src/main/java/org/springblade/modules/place/controller/PlaceCheckController.java

@@ -26,10 +26,13 @@
import javax.validation.Valid;

import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.log.logger.BladeLogger;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.place.dto.PlaceCheckDTO;
@@ -59,6 +62,7 @@
public class PlaceCheckController{

    private final IPlaceCheckService placeCheckService;
    private final BladeLogger bladeLogger;

    /**
     * 场所检查表 详情
@@ -86,8 +90,10 @@
     */
    @GetMapping("/page")
    @ApiOperationSupport(order = 3)
    @ApiLog("场所检查表 自定义分页")
    @ApiOperation(value = "分页", notes = "传入placeCheck")
    public R<IPage<PlaceCheckVO>> page(PlaceCheckVO placeCheck, Query query) {
        bladeLogger.info("场所检查表 自定义分页", JsonUtil.toJson(placeCheck));
        IPage<PlaceCheckVO> pages = placeCheckService.selectPlaceCheckPage(Condition.getPage(query), placeCheck);
        return R.data(pages);
    }
@@ -107,8 +113,10 @@
     */
    @PostMapping("/saveTwo")
    @ApiOperationSupport(order = 4)
    @ApiLog("场所检查表 新增")
    @ApiOperation(value = "新增", notes = "传入placeCheck")
    public R saveTwo(@Valid @RequestBody PlaceCheckVO placeCheck) throws Exception {
        bladeLogger.info("场所检查表 新增", JsonUtil.toJson(placeCheck));
        return R.status(placeCheckService.savePlace(placeCheck));
    }

@@ -136,9 +144,11 @@
     * 场所检查表 删除
     */
    @PostMapping("/remove")
    @ApiLog("场所检查表 删除")
    @ApiOperationSupport(order = 7)
    @ApiOperation(value = "逻辑删除", notes = "传入ids")
    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
        bladeLogger.info("场所检查表 删除", JsonUtil.toJson(ids));
        return R.status(placeCheckService.removeByIds(Func.toLongList(ids)));
    }

@@ -147,9 +157,11 @@
     * @param placeCheck
     */
    @GetMapping("export-placeCheck")
    @ApiLog("导出场所检查信息")
    @ApiOperationSupport(order = 8)
    @ApiOperation(value = "导出场所检查", notes = "传入placeCheck")
    public void exportPlaceCheck(PlaceCheckVO placeCheck, HttpServletResponse response) {
        bladeLogger.info("导出场所检查信息", JsonUtil.toJson(placeCheck));
        List<PlaceCheckExcel> list = placeCheckService.exportPlaceCheck(placeCheck);
        ExcelUtil.export(response, "场所检查" + DateUtil.time(), "场所检查记录表", list, PlaceCheckExcel.class);
    }

 src/main/java/org/springblade/modules/place/controller/PlaceController.java

@@ -26,9 +26,12 @@
import javax.validation.Valid;

import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.log.logger.BladeLogger;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.place.excel.*;
@@ -56,6 +59,7 @@
public class PlaceController extends BladeController{

    private final IPlaceService placeService;
    private final BladeLogger bladeLogger;

    /**
     * 场所表 详情
@@ -81,10 +85,12 @@
    /**
     * 场所表 自定义分页
     */
    @ApiLog("场所列表查询")
    @GetMapping("/page")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页page", notes = "传入place")
    public R<IPage<PlaceVO>> page(PlaceVO place, Query query) {
        bladeLogger.info("blade-place_page", JsonUtil.toJson(place));
        IPage<PlaceVO> pages = placeService.selectPlacePage(Condition.getPage(query), place);
        return R.data(pages);
    }
@@ -92,10 +98,12 @@
    /**
     * 九小场所档案
     */
    @ApiLog("九小场所档案列表查询")
    @GetMapping("/ninePage")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "九小场所档案", notes = "传入place")
    public R<IPage<PlaceVO>> ninePage(PlaceVO place, Query query) {
        bladeLogger.info("blade-place_ninePage", JsonUtil.toJson(place));
        IPage<PlaceVO> pages = placeService.selectNinePlacePage(Condition.getPage(query), place);
        return R.data(pages);
    }
@@ -103,10 +111,12 @@
    /**
     * 企业商超列表查询
     */
    @ApiLog("企业商超列表查询")
    @GetMapping("/mallPage")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "企业商超列表查询", notes = "传入place")
    public R<IPage<PlaceVO>> mallPage(PlaceVO place, Query query) {
        bladeLogger.info("blade-place_mallPage", JsonUtil.toJson(place));
        IPage<PlaceVO> pages = placeService.selectMallPage(Condition.getPage(query), place);
        return R.data(pages);
    }
@@ -127,8 +137,10 @@
     * @return
     */
    @PostMapping("/add")
    @ApiLog("场所自定义新增")
    @ApiOperation(value = "自定义新增", notes = "传入place")
    public R add(@RequestBody PlaceVO placeVO){
        bladeLogger.info("场所自定义新增", JsonUtil.toJson(placeVO));
        return R.status(placeService.addOrUpdate(placeVO));
    }

@@ -139,8 +151,10 @@
     * @return
     */
    @PostMapping("/addOrUpdate")
    @ApiLog("场所自定义新增/修改")
    @ApiOperation(value = "自定义新增/修改", notes = "传入place")
    public R addOrUpdate(@RequestBody PlaceVO placeVO){
        bladeLogger.info("场所自定义新增/修改", JsonUtil.toJson(placeVO));
        return R.status(placeService.addOrUpdate(placeVO));
    }

@@ -181,8 +195,10 @@
     */
    @PostMapping("/remove")
    @ApiOperationSupport(order = 7)
    @ApiLog("场所数据删除")
    @ApiOperation(value = "逻辑删除", notes = "传入ids")
    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
        bladeLogger.info("场所数据删除", JsonUtil.toJson(ids));
        List<Long> longs = Func.toLongList(ids);
        // 返回
        return R.status(placeService.removePlace(longs));
@@ -225,8 +241,10 @@
     * @return
     */
    @GetMapping("/getDetail")
    @ApiLog("场所表 自定义详情查询")
    @ApiOperation(value = "场所表 自定义详情查询", notes = "传入ids")
    public R<PlaceVO> getDetail(PlaceVO place) {
        bladeLogger.info("场所表 自定义详情查询", JsonUtil.toJson(place));
        return R.data(placeService.getDetail(place));
    }

@@ -281,6 +299,7 @@
     */
    @GetMapping("exportNineType")
    @ApiOperationSupport(order = 13)
    @ApiLog("导出九小统计")
    @ApiOperation(value = "导出九小统计", notes = "传入place")
    public void exportNineType(PlaceVO place, HttpServletResponse response) {
        List<NinePlaceExcel> list = placeService.export(place);

 src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml

@@ -99,6 +99,7 @@
            </if>
           and jpar.is_deleted = 0
        </where>
        order by jpar.id desc,jpar.create_time desc
    </select>

    <resultMap type="org.springblade.modules.police.dto.PoliceAlarmRecordsDTO" id="PoliceAlarmRecordsDTOResult">