1、nacos dev 地址改为8848 2、行政区划支持查询第四级 3、物资管理、队伍管理查询接口修改

guoshilong

2023-06-02 9cbe73873e3b523a3eaa12051084a5f5191760ef

1、nacos dev 地址改为8848
2、行政区划支持查询第四级
3、物资管理、队伍管理查询接口修改

 skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java

@@ -40,7 +40,7 @@
    /**
     * nacos dev 地址
     */
    String NACOS_DEV_ADDR = "127.0.0.1:8849";
    String NACOS_DEV_ADDR = "127.0.0.1:8848";

    /**
     * nacos prod 地址

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/controller/MaterialsManageController.java

@@ -2,6 +2,7 @@

import cn.gistack.sm.materials.entity.MaterialsManage;
import cn.gistack.sm.materials.service.IMaterialsManageService;
import cn.gistack.sm.materials.vo.MaterialsManageVO;
import cn.gistack.system.user.entity.User;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -53,8 +54,9 @@
     */
    @ApiOperation(value = "应急物资管理-分页列表查询", notes = "应急物资管理-分页列表查询")
    @GetMapping(value = "/page")
    public R queryPageList(@ApiIgnore @RequestParam Map<String, Object> materialsManage, Query query) {
        IPage<MaterialsManage> pageList = materialsManageService.page(Condition.getPage(query), Condition.getQueryWrapper(materialsManage,MaterialsManage.class));
    public R queryPageList(MaterialsManageVO materialsManage, Query query) {
//        IPage<MaterialsManage> pageList = materialsManageService.page(Condition.getPage(query), Condition.getQueryWrapper(materialsManage,MaterialsManage.class));
        IPage<MaterialsManageVO> pageList = materialsManageService.selectPage(Condition.getPage(query),materialsManage);
        return R.data(pageList);
    }


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/controller/RescueTeamManageController.java

@@ -2,6 +2,7 @@

import cn.gistack.sm.materials.entity.RescueTeamManage;
import cn.gistack.sm.materials.service.IRescueTeamManageService;
import cn.gistack.sm.materials.vo.RescueTeamManageVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -50,8 +51,9 @@
     */
    @ApiOperation(value = "分页列表查询", notes = "分页列表查询")
    @GetMapping(value = "/page")
    public R queryPageList(@ApiIgnore @RequestParam Map<String, Object> rescueTeamManage, Query query) {
        IPage<RescueTeamManage> pageList = rescueTeamManageService.page(Condition.getPage(query), Condition.getQueryWrapper(rescueTeamManage,RescueTeamManage.class));
    public R queryPageList(RescueTeamManageVO rescueTeamManage ,Query query) {
//        IPage<RescueTeamManage> pageList = rescueTeamManageService.page(Condition.getPage(query), Condition.getQueryWrapper(rescueTeamManage,RescueTeamManage.class));
        IPage<RescueTeamManageVO> pageList = rescueTeamManageService.selectPage(Condition.getPage(query),rescueTeamManage);
        return R.data(pageList);
    }


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/entity/MaterialsManage.java

@@ -1,5 +1,7 @@
package cn.gistack.sm.materials.entity;

import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -37,15 +39,24 @@
     * 城市
     */
    @ApiModelProperty(value = "城市")
    @TableField(value = "city",updateStrategy = FieldStrategy.IGNORED)
    private String city;

    /**
     * 乡镇
     */
    @ApiModelProperty(value = "乡镇")
    @ApiModelProperty(value = "区县")
    @TableField(value = "county",updateStrategy = FieldStrategy.IGNORED)
    private String county;

    /**
     * 乡镇
     */
    @ApiModelProperty(value = "乡镇")
    @TableField(value = "town",updateStrategy = FieldStrategy.IGNORED)
    private String town;

    /**
     * 物资类型
     */
    @ApiModelProperty(value = "物资类型")

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/entity/RescueTeamManage.java

@@ -1,5 +1,7 @@
package cn.gistack.sm.materials.entity;

import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -37,15 +39,24 @@
     * 城市
     */
    @ApiModelProperty(value = "城市")
    @TableField(value = "city",updateStrategy = FieldStrategy.IGNORED)
    private String city;

    /**
     * 乡镇
     */
    @ApiModelProperty(value = "乡镇")
    @ApiModelProperty(value = "区县")
    @TableField(value = "county",updateStrategy = FieldStrategy.IGNORED)
    private String county;

    /**
     * 乡镇
     */
    @ApiModelProperty(value = "乡镇")
    @TableField(value = "town",updateStrategy = FieldStrategy.IGNORED)
    private String town;

    /**
     * 名称
     */
    @ApiModelProperty(value = "名称")

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/MaterialsManageMapper.java

@@ -1,7 +1,11 @@
package cn.gistack.sm.materials.mapper;

import cn.gistack.sm.materials.entity.MaterialsManage;
import cn.gistack.sm.materials.vo.MaterialsManageVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * @PROJECT_NAME: skjcmanager
@@ -11,4 +15,5 @@
 */
public interface MaterialsManageMapper extends BaseMapper<MaterialsManage> {

    List<MaterialsManageVO> selectMyPage(@Param("vo") MaterialsManageVO materialsManage);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/MaterialsManageMapper.xml

@@ -2,4 +2,30 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="cn.gistack.sm.materials.mapper.MaterialsManageMapper">
    <!--namespace根据自己需要创建的的mapper的路径和名称填写-->
    <select id="selectMyPage" resultType="cn.gistack.sm.materials.vo.MaterialsManageVO">
        SELECT MM.*,
            aab1."ad_name" cityName,
            aab2."ad_name" countyName,
            aab3."ad_name" townName
            FROM SM_MATERIALS_MANAGE MM
        LEFT JOIN SJZT_MD."att_ad_base" aab1 ON aab1."guid" = MM.city
        LEFT JOIN SJZT_MD."att_ad_base" aab2 ON aab2."guid" = MM.county
        LEFT JOIN SJZT_MD."att_ad_base" aab3 ON aab3."guid" = MM.town
        WHERE MM.IS_DELETED = 0
        <if test="vo.resName !=null and vo.resName !=''">
            AND MM.RES_NAME LIKE CONCAT('%',#{vo.resName},'%')
        </if>
        <if test="vo.materialsType !=null and vo.materialsType !=''">
            AND MM.MATERIALS_TYPE = #{vo.materialsType}
        </if>
        <if test="vo.city !=null and vo.city !=''">
            AND MM.city = #{vo.city}
        </if>
        <if test="vo.county !=null and vo.county !=''">
            AND MM.county = #{vo.county}
        </if>
        <if test="vo.town !=null and vo.town !=''">
            AND MM.town = #{vo.town}
        </if>
    </select>
</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/RescueTeamManageMapper.java

@@ -1,7 +1,12 @@
package cn.gistack.sm.materials.mapper;

import cn.gistack.sm.materials.entity.RescueTeamManage;
import cn.gistack.sm.materials.vo.RescueTeamManageVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * @PROJECT_NAME: skjcmanager
@@ -11,4 +16,5 @@
 */
public interface RescueTeamManageMapper extends BaseMapper<RescueTeamManage> {

    List<RescueTeamManageVO> selectMyPage(IPage<RescueTeamManageVO> page, @Param("vo") RescueTeamManageVO rescueTeamManage);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/RescueTeamManageMapper.xml

@@ -2,4 +2,33 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="cn.gistack.sm.materials.mapper.RescueTeamManageMapper">
    <!--namespace根据自己需要创建的的mapper的路径和名称填写-->
    <select id="selectMyPage" resultType="cn.gistack.sm.materials.vo.RescueTeamManageVO">
        SELECT RM.*,
        aab1."ad_name" cityName,
        aab2."ad_name" countyName,
        aab3."ad_name" townName
        FROM SM_RESCUETEAM_MANAGE RM
        LEFT JOIN SJZT_MD."att_ad_base" aab1 ON aab1."guid" = RM.city
        LEFT JOIN SJZT_MD."att_ad_base" aab2 ON aab2."guid" = RM.county
        LEFT JOIN SJZT_MD."att_ad_base" aab3 ON aab3."guid" = RM.town
        WHERE RM.IS_DELETED = 0
        <if test="vo.resName !=null and vo.resName !=''">
            AND RM.RES_NAME LIKE CONCAT('%',#{vo.resName},'%')
        </if>
        <if test="vo.userName !=null and vo.userName !=''">
            AND RM.USER_NAME LIKE CONCAT('%',#{vo.userName},'%')
        </if>
        <if test="vo.userPhone !=null and vo.userPhone !=''">
            AND RM.USER_PHONE LIKE CONCAT('%',#{vo.userPhone},'%')
        </if>
        <if test="vo.city !=null and vo.city !=''">
            AND RM.city = #{vo.city}
        </if>
        <if test="vo.county !=null and vo.county !=''">
            AND RM.county = #{vo.county}
        </if>
        <if test="vo.town !=null and vo.town !=''">
            AND RM.town = #{vo.town}
        </if>
    </select>
</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/service/IMaterialsManageService.java

@@ -1,6 +1,8 @@
package cn.gistack.sm.materials.service;

import cn.gistack.sm.materials.entity.MaterialsManage;
import cn.gistack.sm.materials.vo.MaterialsManageVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;

/**
@@ -10,4 +12,5 @@
 * @DATE: 2023/5/30 15:11
 */
public interface IMaterialsManageService extends BaseService<MaterialsManage> {
    IPage<MaterialsManageVO> selectPage(IPage<MaterialsManageVO> page, MaterialsManageVO materialsManage);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/service/IRescueTeamManageService.java

@@ -1,6 +1,9 @@
package cn.gistack.sm.materials.service;

import cn.gistack.sm.materials.entity.RescueTeamManage;
import cn.gistack.sm.materials.vo.RescueTeamManageVO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;

/**
@@ -10,4 +13,5 @@
 * @DATE: 2023/5/30 15:11
 */
public interface IRescueTeamManageService extends BaseService<RescueTeamManage> {
    IPage<RescueTeamManageVO> selectPage(IPage<RescueTeamManageVO> page, RescueTeamManageVO rescueTeamManage);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/service/impl/MaterialsManageServiceImpl.java

@@ -3,6 +3,8 @@
import cn.gistack.sm.materials.entity.MaterialsManage;
import cn.gistack.sm.materials.mapper.MaterialsManageMapper;
import cn.gistack.sm.materials.service.IMaterialsManageService;
import cn.gistack.sm.materials.vo.MaterialsManageVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;

@@ -14,4 +16,8 @@
 */
@Service
public class MaterialsManageServiceImpl extends BaseServiceImpl<MaterialsManageMapper, MaterialsManage> implements IMaterialsManageService {
    @Override
    public IPage<MaterialsManageVO> selectPage(IPage<MaterialsManageVO> page, MaterialsManageVO materialsManage) {
        return page.setRecords(baseMapper.selectMyPage(materialsManage));
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/service/impl/RescueTeamManageServiceImpl.java

@@ -3,6 +3,9 @@
import cn.gistack.sm.materials.entity.RescueTeamManage;
import cn.gistack.sm.materials.mapper.RescueTeamManageMapper;
import cn.gistack.sm.materials.service.IRescueTeamManageService;
import cn.gistack.sm.materials.vo.RescueTeamManageVO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;

@@ -14,4 +17,8 @@
 */
@Service
public class RescueTeamManageServiceImpl extends BaseServiceImpl<RescueTeamManageMapper, RescueTeamManage> implements IRescueTeamManageService {
    @Override
    public IPage<RescueTeamManageVO> selectPage(IPage<RescueTeamManageVO> page, RescueTeamManageVO rescueTeamManage) {
        return page.setRecords(baseMapper.selectMyPage(page,rescueTeamManage));
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/vo/MaterialsManageVO.java

New file
@@ -0,0 +1,23 @@
package cn.gistack.sm.materials.vo;

import cn.gistack.sm.materials.entity.MaterialsManage;
import lombok.Data;

@Data
public class MaterialsManageVO extends MaterialsManage {

    /**
     * 市名
     */
    private String cityName;

    /**
     * 区县名
     */
    private String countyName;

    /**
     * 镇名
     */
    private String townName;
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/vo/RescueTeamManageVO.java

New file
@@ -0,0 +1,24 @@
package cn.gistack.sm.materials.vo;

import cn.gistack.sm.materials.entity.MaterialsManage;
import cn.gistack.sm.materials.entity.RescueTeamManage;
import lombok.Data;

@Data
public class RescueTeamManageVO extends RescueTeamManage {

    /**
     * 市名
     */
    private String cityName;

    /**
     * 区县名
     */
    private String countyName;

    /**
     * 镇名
     */
    private String townName;
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml

@@ -27,12 +27,14 @@
                and region."p_ad_code" = #{param1}
            </if>
            <if test="param2.code!=null and param2.code!=''">
                and region."ad_code" like concat(concat('%', #{param2.code}),'%')
                and region."ad_code" like concat(#{param2.code},'%')
            </if>
            <if test="param2.name!=null and param2.name!=''">
                and region."ad_name" like concat(concat('%', #{param2.name}),'%')
                and region."ad_name" like concat('%',#{param2.name},'%')
            </if>
            and region."ad_grad" != 4
            <if test="param2.showFour !=null and param2.showFour !=''">
                and  IF(#{param2.showFour} = 'true',region."ad_grad" != 5,region."ad_grad" != 4)
            </if>
        </where>
        ORDER BY region."ad_code"
    </select>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml

@@ -19,7 +19,7 @@
         </if>
    </select>
    <select id="getDetailByCode" resultType="cn.gistack.sm.sjztmd.entity.AttResBase">
        SELECT "code","name","ad_guid","guid" FROM "att_res_base"
        SELECT * FROM "att_res_base"
        WHERE "is_deleted"=0 and "code" = #{code}
    </select>