Merge remote-tracking branch 'git-pipIrr/master'

liurunyu

2023-11-27 0404678803838f95af7b34ab6723ee210b2a8706

Merge remote-tracking branch 'git-pipIrr/master'

 pipIrr-platform/pipIrr-common/pipIrr-common.iml

File was deleted

 pipIrr-platform/pipIrr-global/pipIrr-global.iml

@@ -26,6 +26,7 @@
    <orderEntry type="jdk" jdkName="20" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="pipIrr-common" scope="PROVIDED" />
    <orderEntry type="module" module-name="pipIrr-common" scope="PROVIDED" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:3.1.3" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:3.1.3" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:3.1.3" level="project" />

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDivideMapper.java

@@ -3,6 +3,9 @@
import com.dy.pipIrrGlobal.pojoBa.BaDivide;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;
import java.util.Map;

@Mapper
public interface BaDivideMapper {

@@ -14,6 +17,26 @@
    BaDivide selectByPrimaryKey(Long id);

    /**
     * å¾—到全部实体
     * @return å…¨éƒ¨å®žä½“
     * */
    List<BaDivide> selectAll();

    /**
     * æŸ¥è¯¢æ€»æ•°
     * @param params æŸ¥è¯¢æ¡ä»¶
     * @return æ€»æ•°
     * */
    Long selectTotal(Map<?,?> params);

    /**
     * åˆ†é¡µæŸ¥è¯¢ä¸€äº›
     * @param params æŸ¥è¯¢æ¡ä»¶
     * @return å®žä½“集合
     * */
    List<BaDivide> selectSome(Map<?,?> params);

    /**
     * insert record to table
     * @param record the record
     * @return insert count

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDivide.java

@@ -3,6 +3,7 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
@@ -122,4 +123,15 @@
    @Schema(description = "删除标识，表单不用填写", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    public Byte deleted;

    @TableField(exist = false)
    @Schema(description = "所在片区名称，form表单中不存在，只在查询显示中有效")
    public String blockName ;

    @TableField(exist = false)
    @Schema(description = "所在镇名称，form表单中不存在，只在查询显示中有效")
    public String townName ;

    @TableField(exist = false)
    @Schema(description = "所在村名称，form表单中不存在，只在查询显示中有效")
    public String villageName ;
}

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml

@@ -23,6 +23,13 @@
    <!--@mbg.generated-->
    id, `name`, countyId, townId, villageId, blockId, villages, area, `header`, phone, 
    lng, lat, remark, deleted
  </sql>  <sql id="Base2_Column_List">
    <!--@mbg.generated-->
  ${alias}.id, ${alias}.name, ${alias}.countyId, ${alias}.townId, ${alias}.villageId, ${alias}.blockId, ${alias}.villages, ${alias}.area, ${alias}.header, ${alias}.phone, ${alias}.lng, ${alias}.lat, ${alias}.remark
  </sql>
  <sql id="part_Column_List">
    <!--@mbg.generated-->
    id, `name`
  </sql>
  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
    <!--@mbg.generated-->
@@ -31,11 +38,74 @@
    from ba_divide
    where id = #{id,jdbcType=BIGINT}
  </select>
  <select id="selectAll" resultMap="BaseResultMap">
    <!--@mbg.generated-->
    select
    <include refid="part_Column_List"/>
    from ba_divide
  </select>
  <select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Long">
    <!--@mbg.generated-->
    select
    count(*)
    from ba_divide bd
    left join ba_block bbk on bd.blockId = bbk.id
    where bd.deleted != 1
    <trim prefix="and" suffixOverrides="and">
      <if test="name != null">
        bd.name like concat('%', #{name}, '%') and
      </if>
      <if test="header != null">
        bd.header = '#{header,jdbcType=VARCHAR}' and
      </if>
      <if test="phone != null">
        bd.phone = '#{phone,jdbcType=VARCHAR}' and
      </if>
      <if test="blockName != null">
        bbk.name like concat('%', #{blockName}, '%') and
      </if>
    </trim>
  </select>
  <select id="selectSome" parameterType="java.util.Map" resultMap="BaseResultMap">
    <!--@mbg.generated-->
    select
    <include refid="Base2_Column_List" >
      <property name="alias" value="bd"/>
    </include>,
    bbk.name blockName,
    bdtt.name townName,
    bdtv.name villageName
    from ba_divide bd
    left join ba_block bbk on bd.blockId = bbk.id
    left join ba_district bdtt on bd.townId=bdtt.id
    left join ba_district bdtv on bd.villageId=bdtv.id
    where bd.deleted != 1
    <trim prefix="and" suffixOverrides="and">
      <if test="name != null">
        bd.name like concat('%', #{name}, '%') and
      </if>
      <if test="header != null">
        bd.header = '#{header,jdbcType=VARCHAR}' and
      </if>
      <if test="phone != null">
        bd.phone = '#{phone,jdbcType=VARCHAR}' and
      </if>
      <if test="blockName != null">
        bbk.name like concat('%', #{blockName}, '%') and
      </if>
    </trim>
    order by bd.id DESC
    <trim prefix="limit " >
      <if test="start != null and count != null">
        #{start}, #{count}
      </if>
    </trim>
  </select>
  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaDivide">
    <!--@mbg.generated-->
    insert into ba_divide (id, `name`, countyId, 
      townId, villageId, blockId, 
      villages, area, `header`, 
      villages, area, header,
      phone, lng, lat, remark, 
      deleted)
    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{countyId,jdbcType=BIGINT}, 

 pipIrr-platform/pipIrr-mw/pipIrr-mw.iml

@@ -9,6 +9,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="pipIrr-common" scope="PROVIDED" />
    <orderEntry type="module" module-name="pipIrr-common" scope="PROVIDED" />
    <orderEntry type="module" module-name="pipIrr-global" scope="PROVIDED" />
    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.28" level="project" />
    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.20" level="project" />

 pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/pipIrr-mwTest-server.iml

File was deleted

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/divide/DivideCtrl.java

New file
@@ -0,0 +1,214 @@
package com.dy.pipIrrBase.divide;

import com.dy.common.aop.SsoAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoBa.BaDivide;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Objects;

@Slf4j
@Tag(name = "分水口管理", description = "分水口增删改查等操作")
@RestController
@RequestMapping(path = "divide")
@SuppressWarnings("unchecked")
//java版本越高，对泛型约束越严，所以配置SuppressWarnings("unchecked")
public class DivideCtrl {

    private DivideSv sv;

    @Autowired
    private void setSv(DivideSv sv) { this.sv = sv; }

    /**
     * å®¢æˆ·ç«¯è¯·æ±‚得到所有分水口名字
     * @return æ‰€æœ‰åˆ†æ°´å£åå­—
     */
    @Operation(summary = "获得全部分水口", description = "返回全部分水口数据")
    @ApiResponses(value = {
            @ApiResponse(
                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
                    description = "返回全部分水口数据（BaseResponse.content:QueryResultVo[{}]）",
                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
                            schema = @Schema(implementation = BaDivide.class))}
            )
    })
    @GetMapping(path = "all")
    @SsoAop("-1")
    public BaseResponse<QueryResultVo<List<BaDivide>>> all(){
        try {
            QueryResultVo<List<BaDivide>> res = this.sv.selectAll() ;
            return BaseResponseUtils.buildSuccess(res);
        } catch (Exception e) {
            log.error("查询分水口异常", e);
            return BaseResponseUtils.buildException(e.getMessage()) ;
        }
    }

    /**
     * å¾—到一个分水口数据
     * @return ä¸€ä¸ªåˆ†æ°´å£æ•°æ®
     */
    @Operation(summary = "一个分水口", description = "得到一个分水口数据")
    @ApiResponses(value = {
            @ApiResponse(
                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
                    description = "返回一个分水口数据（BaseResponse.content:{}）",
                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
                            schema = @Schema(implementation = BaDivide.class))}
            )
    })
    @GetMapping(path = "one", consumes = MediaType.TEXT_PLAIN_VALUE)
    @SsoAop("-1")
    public BaseResponse<BaDivide> one(@Parameter(description = "实体id", required = true) Long id){
        return BaseResponseUtils.buildSuccess(this.sv.selectById(id));
    }
    /**
     * å®¢æˆ·ç«¯è¯·æ±‚得到一些分水口数据
     * @return ä¸€äº›åˆ†æ°´å£æ•°æ®
     */
    @Operation(summary = "获得一些分水口", description = "返回一些分页分水口数据")
    @ApiResponses(value = {
            @ApiResponse(
                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
                    description = "返回一些分水口数据（BaseResponse.content:QueryResultVo[{}]）",
                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
                            schema = @Schema(implementation = BaDivide.class))}
            )
    })
    @PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
    @SsoAop("-1")
    public BaseResponse<QueryResultVo<List<BaDivide>>> some(@RequestBody @Parameter(description = "查询form表单json数据", required = true) DivideVo vo){
        try {
            QueryResultVo<List<BaDivide>> res = this.sv.selectSome(vo) ;
            return BaseResponseUtils.buildSuccess(res);
        } catch (Exception e) {
            log.error("查询分水口异常", e);
            return BaseResponseUtils.buildException(e.getMessage()) ;
        }
    }

    /**
     * æ–°å¢žä¿å­˜åˆ†æ°´å£
     * @param po æ–°å¢žä¿å­˜åˆ†æ°´å£form表单对象
     * @return æ˜¯å¦æˆåŠŸ
     */
    @Operation(summary = "保存分水口", description = "提交分水口数据（form表单），进行保存")
    @ApiResponses(value = {
            @ApiResponse(
                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
                    description = "操作结果：true：成功，false：失败（BaseResponse.content）",
                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
                            schema = @Schema(implementation = Boolean.class))}
            )
    })
    @PostMapping(path = "save", consumes = MediaType.APPLICATION_JSON_VALUE)
    @SsoAop("-1")//@SsoAop(power = "-1")
    public BaseResponse<Boolean> save(@RequestBody @Parameter(description = "form表单json数据", required = true) @Valid BaDivide po, @Parameter(hidden = true) BindingResult bindingResult){
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
        po.id = null ;
        int count;
        try {
            count = this.sv.save(po);
        } catch (Exception e) {
            log.error("保存分水口异常", e);
            return BaseResponseUtils.buildException(e.getMessage()) ;
        }
        if(count <= 0){
            return BaseResponseUtils.buildFail("数据库存储失败") ;
        }else{
            return BaseResponseUtils.buildSuccess(true) ;
        }
    }
    /**
     * ç¼–辑修改分水口
     * @param po ä¿å­˜åˆ†æ°´å£form表单对象
     * @return æ˜¯å¦æˆåŠŸ
     */
    @Operation(summary = "编辑修改片区", description = "提交片区数据（form表单），进行修改")
    @ApiResponses(value = {
            @ApiResponse(
                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
                    description = "操作结果：true：成功，false：失败（BaseResponse.content）",
                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
                            schema = @Schema(implementation = Boolean.class))}
            )
    })
    @PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
    @SsoAop("-1")//@SsoAop(power = "-1")
    public BaseResponse<Boolean> update(@RequestBody @Parameter(description = "form表单json数据", required = true) @Valid BaDivide po, @Parameter(hidden = true) BindingResult bindingResult){
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
        if(po.id == null){
            return BaseResponseUtils.buildFail("无数据实体ID") ;
        }
        int count;
        try {
            count = this.sv.update(po);
        } catch (Exception e) {
            log.error("保存分水口异常", e);
            return BaseResponseUtils.buildException(e.getMessage()) ;
        }
        if(count <= 0){
            return BaseResponseUtils.buildFail("数据库存储失败") ;
        }else{
            return BaseResponseUtils.buildSuccess(true) ;
        }
    }


    /**
     * åˆ é™¤åˆ†æ°´å£
     * @param id åˆ†æ°´å£ID
     * @return æ˜¯å¦æˆåŠŸ
     */
    @Operation(summary = "删除分水口", description = "提交分水口ID，进行逻辑删除")
    @ApiResponses(value = {
            @ApiResponse(
                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
                    description = "操作结果：true：成功，false：失败（BaseResponse.content）",
                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
                            schema = @Schema(implementation = Boolean.class))}
            )
    })
    @GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE)
    @SsoAop("-1")//@SsoAop(power = "-1")
    public BaseResponse<Boolean> delete(@Parameter(description = "实体id", required = true) Long id){
        if(id == null){
            return BaseResponseUtils.buildFail("id不能为空") ;
        }
        int count;
        try {
            count = this.sv.delete(id);
        } catch (Exception e) {
            log.error("保存分水口异常", e);
            return BaseResponseUtils.buildException(e.getMessage()) ;
        }
        if(count <= 0){
            return BaseResponseUtils.buildFail("数据库存储失败") ;
        }else{
            return BaseResponseUtils.buildSuccess(true) ;
        }
    }
}



 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/divide/DivideSv.java

New file
@@ -0,0 +1,87 @@
package com.dy.pipIrrBase.divide;

import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoBa.BaDivideMapper;
import com.dy.pipIrrGlobal.pojoBa.BaDivide;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Map;

@Slf4j
@Service
public class DivideSv {

    private BaDivideMapper dao;

    @Autowired
    private void setDao(BaDivideMapper dao) { this.dao = dao; }

    /**
     * å¾—到所有分水口
     * @return æ‰€æœ‰åˆ†æ°´å£é›†åˆ
     */
    public QueryResultVo<List<BaDivide>> selectAll(){
        QueryResultVo<List<BaDivide>> rsVo = new QueryResultVo<>() ;
        rsVo.obj = this.dao.selectAll() ;
        return rsVo ;
    }
    /**
     * å¾—到一个分水口
     * @param id åˆ†æ°´å£ID
     * @return åˆ†æ°´å£å®žä½“
     */
    public BaDivide selectById(Long id){
        return this.dao.selectByPrimaryKey(id) ;
    }
    /**
     * å¾—到一些分水口
     * @param vo æŸ¥è¯¢æ¡ä»¶å€¼å¯¹è±¡
     * @return åˆ†æ°´å£å®žä½“
     */
    @SuppressWarnings("unchecked")
    public QueryResultVo<List<BaDivide>> selectSome(DivideVo vo){
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo) ;
        Long itemTotal = this.dao.selectTotal(params) ;

        QueryResultVo<List<BaDivide>> rsVo = new QueryResultVo<>() ;
        rsVo.pageSize = vo.pageSize ;
        rsVo.pageCurr = vo.pageCurr ;
        rsVo.calculateAndSet(itemTotal, params);
        rsVo.obj = this.dao.selectSome(params) ;

        return rsVo ;
    }
    /**
     * æ–°å¢žä¿å­˜åˆ†æ°´å£å®žä½“
     * @param po å®žä½“
     * @return æ•°é‡
     */
    @Transactional
    public int save(BaDivide po){
        return this.dao.insertSelective(po) ;
    }
    /**
     * ä¿å­˜ä¿®æ”¹å®žä½“
     * @param po å®žä½“
     * @return æ•°é‡
     */
    @Transactional
    public int update(BaDivide po){
        return this.dao.updateByPrimaryKeySelective(po) ;
    }

    /**
     * é€»è¾‘删除实体
     * @param id å®žä½“ID
     * @return æ•°é‡
     */
    @Transactional
    public int delete(Long id){
        return this.dao.deleteLogicById(id) ;
    }
}

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/divide/DivideVo.java

New file
@@ -0,0 +1,27 @@
package com.dy.pipIrrBase.divide;

import com.dy.common.webUtil.QueryConditionVo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;

@Data
@EqualsAndHashCode(callSuper = false)
@ToString(callSuper = true)
@NoArgsConstructor
@AllArgsConstructor
@Builder
@Schema(name = "分水口查询条件")
public class DivideVo extends QueryConditionVo {

    @Schema(description = "分水口名称")
    public String name;

    @Schema(description = "所属片区")
    public String blockName;

    @Schema(description = "负责人")
    public String header;

    @Schema(description = "负责人电话")
    public String phone;
}

 pipIrr-platform/pipIrr-web/pipIrr-web.iml

@@ -23,6 +23,7 @@
    <orderEntry type="jdk" jdkName="20" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="pipIrr-common" />
    <orderEntry type="module" module-name="pipIrr-common" />
    <orderEntry type="library" name="Maven: org.apache.mina:mina-core:2.2.2" level="project" />
    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" />
    <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.15" level="project" />

 pipIrr-platform/Îĵµ/~$pIrr½Ó¿Ú.docx

Binary files differ