From c15d1e0b280a171a6a71ac3f7993ac5dea21f3b3 Mon Sep 17 00:00:00 2001
From: yf <428080876@qq.com>
Date: Wed, 16 Jun 2021 14:31:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=88=86=E9=A1=B5=E6=80=BB?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarStandAttrDetailsServiceImpl.java            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/service/impl/SarStandAttrDetailsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/service/impl/SarStandAttrDetailsServiceImpl.java
index d7682786..358a90b1 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/service/impl/SarStandAttrDetailsServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/service/impl/SarStandAttrDetailsServiceImpl.java
@@ -68,6 +68,8 @@ public class SarStandAttrDetailsServiceImpl extends ServiceImpl<SarStandAttrDeta
 
     @Override
     public List<SarStandAttrDetails> queryByPage(SarStandAttrDetailsEOPage page){
+        Integer pageCount = dao.queryByCount(page);
+        page.getPager().setRowCount(pageCount);
         return dao.queryByPage(page);
     }
 

From 6f416e24e61a586bbe3efa8f89257ad9f708b2d2 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 16 Jun 2021 15:07:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=8C=BA=E5=9F=9F=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../utArea/controller/UtAreaController.java   |  55 +++++++++
 .../com/adc/da/slrs/utArea/dao/UtAreaDao.java |  10 ++
 .../slrs/utArea/service/IUtAreaService.java   |   9 ++
 .../service/impl/UtAreaServiceImpl.java       |  57 +++++++++
 .../mybatis/mapper/utArea/UtAreaMapper.xml    | 116 ++++++++++++++++++
 5 files changed, 247 insertions(+)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/controller/UtAreaController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/controller/UtAreaController.java
index f37d5ea0..6ae9b575 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/controller/UtAreaController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/controller/UtAreaController.java
@@ -43,4 +43,59 @@ public class UtAreaController extends BaseController<UtArea> {
         return Result.success(utAreaEOService.getAreaSelList(utAreaEO));
     }
 
+    @ApiOperation(value = "|UtAreaEO|分页查询")
+    @GetMapping("/page")
+//    @RequiresPermissions("lawssBase:utArea:page")
+    public ResponseMessage<PageInfo<UtArea>> page(UtAreaEOPage page) throws Exception {
+        List<UtArea> rows = utAreaEOService.queryByPage(page);
+        return Result.success(getPageInfo(page.getPager(), rows));
+    }
+
+    @ApiOperation(value = "|UtAreaEO|查询")
+    @GetMapping("/list")
+//    @RequiresPermissions("lawssBase:utArea:list")
+    public ResponseMessage<List<UtArea>> list(UtAreaEOPage page) throws Exception {
+        return Result.success(utAreaEOService.queryByList(page));
+    }
+
+    @ApiOperation(value = "|UtAreaEO|详情")
+    @GetMapping("/getById")
+//    @RequiresPermissions("lawssBase:utArea:get")
+    public ResponseMessage<UtArea> find(@PathVariable String id) throws Exception {
+        return Result.success(utAreaEOService.getById(id));
+    }
+
+    @ApiOperation(value = "|UtAreaEO|新增")
+    @PostMapping("/createUtArea")
+//    @RequiresPermissions("lawssBase:utArea:save")
+    public ResponseMessage<UtArea> create(@RequestBody UtArea utAreaEO) throws Exception {
+        String result = utAreaEOService.createUtArea(utAreaEO);
+        if ("success".equals(result)) {
+            return Result.success("0","新增成功",utAreaEO);
+        } else {
+            return Result.error("0",result,utAreaEO);
+        }
+    }
+
+    @ApiOperation(value = "|UtAreaEO|修改")
+    @PutMapping("/updateUtArea")
+//    @RequiresPermissions("lawssBase:utArea:update")
+    public ResponseMessage<UtArea> update(@RequestBody UtArea utAreaEO) throws Exception {
+        String result = utAreaEOService.updateUtArea(utAreaEO);
+        if ("success".equals(result)) {
+            return Result.success("0","修改成功",utAreaEO);
+        } else {
+            return Result.error("0",result,utAreaEO);
+        }
+    }
+
+    @ApiOperation(value = "|UtAreaEO|删除")
+    @DeleteMapping("/deleteById")
+//    @RequiresPermissions("lawssBase:utArea:delete")
+    public ResponseMessage delete(String id) throws Exception {
+        utAreaEOService.removeById(id);
+        logger.info("delete from UT_AREA where id = {}", id);
+        return Result.success();
+    }
+
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/dao/UtAreaDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/dao/UtAreaDao.java
index fbdce2ae..a7a19747 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/dao/UtAreaDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/dao/UtAreaDao.java
@@ -1,6 +1,7 @@
 package com.adc.da.slrs.utArea.dao;
 
 import com.adc.da.slrs.utArea.entity.UtArea;
+import com.adc.da.slrs.utArea.page.UtAreaEOPage;
 import com.adc.da.sys.common.SelectionResult;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -16,6 +17,15 @@ import java.util.List;
  */
 public interface UtAreaDao extends BaseMapper<UtArea> {
 
+    Integer queryByCount(UtAreaEOPage page);
+
+    List<UtArea> queryByPage(UtAreaEOPage page);
+
+    List<UtArea> queryByList(UtAreaEOPage page);
+
+
+
+
     List<SelectionResult> getAreaSelList(UtArea utAreaEO);
 
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/IUtAreaService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/IUtAreaService.java
index 5946dd41..64267ff5 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/IUtAreaService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/IUtAreaService.java
@@ -1,6 +1,7 @@
 package com.adc.da.slrs.utArea.service;
 
 import com.adc.da.slrs.utArea.entity.UtArea;
+import com.adc.da.slrs.utArea.page.UtAreaEOPage;
 import com.adc.da.sys.common.SelectionResult;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -17,4 +18,12 @@ import java.util.List;
 public interface IUtAreaService extends IService<UtArea> {
 
     List<SelectionResult> getAreaSelList(UtArea utAreaEO);
+
+    List<UtArea> queryByPage(UtAreaEOPage page);
+
+    List<UtArea> queryByList(UtAreaEOPage page);
+
+    String createUtArea(UtArea utAreaEO);
+
+    String updateUtArea(UtArea utAreaEO);
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/impl/UtAreaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/impl/UtAreaServiceImpl.java
index a33f5b8c..f7dda383 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/impl/UtAreaServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/impl/UtAreaServiceImpl.java
@@ -2,14 +2,18 @@ package com.adc.da.slrs.utArea.service.impl;
 
 import com.adc.da.slrs.utArea.entity.UtArea;
 import com.adc.da.slrs.utArea.dao.UtAreaDao;
+import com.adc.da.slrs.utArea.page.UtAreaEOPage;
 import com.adc.da.slrs.utArea.service.IUtAreaService;
 import com.adc.da.sys.common.SelectionResult;
+import com.adc.da.util.LoginUserUtil;
+import com.adc.da.util.UUIDUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -36,4 +40,57 @@ public class UtAreaServiceImpl extends ServiceImpl<UtAreaDao, UtArea> implements
         return dao.getAreaSelList(utAreaEO);
     }
 
+    @Override
+    public List<UtArea> queryByPage(UtAreaEOPage page){
+        Integer rowCount = dao.queryByCount(page);
+        page.getPager().setRowCount(rowCount);
+        return dao.queryByPage(page);
+    }
+
+    @Override
+    public List<UtArea> queryByList(UtAreaEOPage page){
+        return dao.queryByList(page);
+    }
+
+    public String createUtArea (UtArea utAreaEO) {
+        // 判断名称是否已存在
+        UtAreaEOPage page = new UtAreaEOPage();
+        page.setAreaName(utAreaEO.getAreaName());
+        page.setSarType(utAreaEO.getSarType());
+        List<UtArea> getList = dao.queryByList(page);
+        if (getList != null && !getList.isEmpty()) {
+            return "新增失败，展示区域名称已存在";
+        }
+        utAreaEO.setId(UUIDUtils.randomUUID20());
+        utAreaEO.setCreationUser(LoginUserUtil.getUserId());
+        utAreaEO.setCreationTime(new Date());
+        utAreaEO.setModifyTime(new Date());
+        utAreaEO.setValidFlag(0);
+        int result = dao.insert(utAreaEO);
+        if (result > 0) {
+            return "success";
+        } else {
+            return "新增失败";
+        }
+    }
+
+    public String updateUtArea (UtArea utAreaEO) {
+        // 判断名称是否已存在
+        UtAreaEOPage page = new UtAreaEOPage();
+        page.setAreaName(utAreaEO.getAreaName());
+        page.setSarType(utAreaEO.getSarType());
+        page.setNotId(utAreaEO.getId());
+        List<UtArea> getList = dao.queryByList(page);
+        if (getList != null && !getList.isEmpty()) {
+            return "修改失败，展示区域名称已存在";
+        }
+        utAreaEO.setModifyTime(new Date());
+        int result = dao.updateById(utAreaEO);
+        if (result > 0) {
+            return "success";
+        } else {
+            return "修改失败";
+        }
+    }
+
 }
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/utArea/UtAreaMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/utArea/UtAreaMapper.xml
index 244b64db..133832f0 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/utArea/UtAreaMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/utArea/UtAreaMapper.xml
@@ -65,6 +65,122 @@
         </trim>
     </sql>
 
+    <!-- 插入记录 -->
+    <insert id="insert" parameterType="com.adc.da.slrs.utArea.entity.UtArea" >
+        <!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+            SELECT SEQ_UT_AREA.NEXTVAL FROM DUAL
+        </selectKey> -->
+        insert into UT_AREA(<include refid="Base_Column_List" />)
+        values (#{id, jdbcType=VARCHAR}, #{areaName, jdbcType=VARCHAR}, #{showIndex, jdbcType=INTEGER}, #{sarType, jdbcType=VARCHAR}, #{creationUser, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP})
+    </insert>
+
+    <!-- 动态插入记录 主键是序列 -->
+    <insert id="insertSelective" parameterType="com.adc.da.slrs.utArea.entity.UtArea" >
+        <!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+        SELECT SEQ_UT_AREA.NEXTVAL FROM DUAL
+    </selectKey> -->
+        insert into UT_AREA
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+            <if test="id != null" >id,</if>
+            <if test="areaName != null" >area_name,</if>
+            <if test="showIndex != null" >show_index,</if>
+            <if test="sarType != null" >sar_type,</if>
+            <if test="creationUser != null" >creation_user,</if>
+            <if test="validFlag != null" >valid_flag,</if>
+            <if test="creationTime != null" >creation_time,</if>
+            <if test="modifyTime != null" >modify_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+            <if test="id != null" >#{id, jdbcType=VARCHAR},</if>
+            <if test="areaName != null" >#{areaName, jdbcType=VARCHAR},</if>
+            <if test="showIndex != null" >#{showIndex, jdbcType=INTEGER},</if>
+            <if test="sarType != null" >#{sarType, jdbcType=VARCHAR},</if>
+            <if test="creationUser != null" >#{creationUser, jdbcType=VARCHAR},</if>
+            <if test="validFlag != null" >#{validFlag, jdbcType=INTEGER},</if>
+            <if test="creationTime != null" >#{creationTime, jdbcType=TIMESTAMP},</if>
+            <if test="modifyTime != null" >#{modifyTime, jdbcType=TIMESTAMP},</if>
+        </trim>
+    </insert>
+
+    <!-- 根据pk，修改记录-->
+    <update id="updateByPrimaryKey" parameterType="com.adc.da.slrs.utArea.entity.UtArea" >
+    update UT_AREA
+       set  area_name = #{areaName},
+            show_index = #{showIndex},
+            sar_type = #{sarType},
+            creation_user = #{creationUser},
+            valid_flag = #{validFlag},
+            creation_time = #{creationTime},
+            modify_time = #{modifyTime}
+     where  id = #{id}
+  </update>
+
+    <!-- 修改记录，只修改只不为空的字段 -->
+    <update id="updateByPrimaryKeySelective" parameterType="com.adc.da.slrs.utArea.entity.UtArea" >
+        update UT_AREA
+        <set >
+            <if test="areaName != null" >
+                area_name = #{areaName},
+            </if>
+            <if test="showIndex != null" >
+                show_index = #{showIndex},
+            </if>
+            <if test="sarType != null" >
+                sar_type = #{sarType},
+            </if>
+            <if test="creationUser != null" >
+                creation_user = #{creationUser},
+            </if>
+            <if test="validFlag != null" >
+                valid_flag = #{validFlag},
+            </if>
+            <if test="creationTime != null" >
+                creation_time = #{creationTime},
+            </if>
+            <if test="modifyTime != null" >
+                modify_time = #{modifyTime},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <!-- 根据id查询 UT_AREA -->
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
+        select <include refid="Base_Column_List" />
+        from UT_AREA
+        where id = #{value}
+
+    </select>
+
+    <!-- 删除记录 -->
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from UT_AREA
+     where id = #{value}
+
+  </delete>
+
+    <!-- UT_AREA 列表总数-->
+    <select id="queryByCount" resultType="java.lang.Integer" parameterType="com.adc.da.base.page.BasePage">
+        select count(1) from UT_AREA
+        <include refid="Base_Where_Clause"/>
+    </select>
+
+    <!-- 查询UT_AREA列表 -->
+    <select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
+        select <include refid="Base_Column_List" /> from
+        (select tmp_tb.* from
+        (select <include refid="Base_Column_List" /> from UT_AREA
+        <include refid="Base_Where_Clause"/>
+        order by show_index,id
+        ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
+    </select>
+
+    <select id="queryByList" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
+        select <include refid="Base_Column_List"/> from UT_AREA
+        <include refid="Base_Where_Clause"/>
+        order by show_index,id
+    </select>
+
     <select id="getAreaSelList" parameterType="com.adc.da.slrs.utArea.entity.UtArea" resultType="com.adc.da.sys.common.SelectionResult">
         select id as value,area_name as label
         from UT_AREA