调整样式

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisStructGridPartyBranchResultDTO.java

@@ -0,0 +1,13 @@
+package com.epmet.plugin.power.dto.axis.result;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PowerAxisStructGridPartyBranchResultDTO {
+    private String id;
+    private String name;
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisStructPartyCommResultDTO.java

@@ -0,0 +1,13 @@
+package com.epmet.plugin.power.dto.axis.result;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PowerAxisStructPartyCommResultDTO {
+    private String id;
+    private String name;
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml

@@ -179,7 +179,7 @@
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
-                <nacos.ip>192.168.43.184</nacos.ip>
+                <nacos.ip>192.168.43.218</nacos.ip>
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
 

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java

@@ -15,11 +15,9 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 
 import com.epmet.plugin.power.dto.axis.PowerAxisStructDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructLeaderFormDTO;
-import com.epmet.plugin.power.dto.axis.result.PowerAxisStructLeaderResultDTO;
+import com.epmet.plugin.power.dto.axis.result.*;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructAddFormDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructFormDTO;
-import com.epmet.plugin.power.dto.axis.result.PowerAxisStructListResultDTO;
-import com.epmet.plugin.power.dto.axis.result.PowerAxisStructResultDTO;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructEntity;
 import com.epmet.plugin.power.modules.axis.excel.PowerAxisStructExcel;
 import com.epmet.plugin.power.modules.axis.service.PowerAxisStructService;
@@ -122,10 +120,63 @@ public class PowerAxisStructController {
      * 添加组织
      */
     @PostMapping("/addOrg")
-    public Result addOrg(@RequestBody PowerAxisStructAddFormDTO form){
+    public Result addOrg(@RequestBody PowerAxisStructEntity form){
         int i = powerAxisStructService.addOrg(form);
-        System.out.println("1111111111");
         return new Result();
     }
+    /**
+     * 修改组织
+     */
+    @PostMapping("/modifyOrg")
+    public Result modifyOrg(@RequestBody PowerAxisStructEntity form){
+        int i = powerAxisStructService.modifyRog(form);
+        if(i == 0){
+            return new Result().error(1,"不能所属自己");
+        }
+        return new Result();
+    }
+
+    /**
+     * 根据id删除
+     */
+    @PostMapping("/deleteById/{id}")
+    public Result deleteById(@PathVariable String id){
+        powerAxisStructService.delete(id);
+        return new Result();
+    }
+    /**
+     * 获取上级网格党支部
+     */
+    @PostMapping("/GridPartyBranchList")
+    public Result<List<PowerAxisStructGridPartyBranchResultDTO>> getGridPartyBranchList(){
+        List<PowerAxisStructGridPartyBranchResultDTO> list = powerAxisStructService.getGridPartyBranchList();
+        return new Result<List<PowerAxisStructGridPartyBranchResultDTO>>().ok(list);
+    }
+
+    /**
+     * 获取上级组织
+     */
+    @PostMapping("/getPartyCommList")
+    public Result<List<PowerAxisStructPartyCommResultDTO>> getPartyCommList(){
+        List<PowerAxisStructPartyCommResultDTO> list = powerAxisStructService.getPartyCommList();
+        return new Result<List<PowerAxisStructPartyCommResultDTO>>().ok(list);
+    }
+
+    /**
+     * 查询父id
+     */
+    @PostMapping("/getPid")
+    public Result<List<String>> getPid(){
+        List<String> pid = powerAxisStructService.getPid();
+        return new Result<List<String>>().ok(pid);
+    }
+    /**
+     * 根据id查询修改表单数据
+     */
+    @PostMapping("/queryModifyById/{id}")
+    public Result<PowerAxisStructEntity> queryModifyById(@PathVariable String id){
+        PowerAxisStructEntity power = powerAxisStructService.queryModifyById(id);
+        return new Result<PowerAxisStructEntity>().ok(power);
+    }
 
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java

@@ -5,10 +5,8 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.plugin.power.dto.axis.PowerAxisStructDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructAddFormDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructFormDTO;
-import com.epmet.plugin.power.dto.axis.result.PowerAxisStructListResultDTO;
+import com.epmet.plugin.power.dto.axis.result.*;
-import com.epmet.plugin.power.dto.axis.result.PowerAxisStructResultDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructLeaderFormDTO;
-import com.epmet.plugin.power.dto.axis.result.PowerAxisStructLeaderResultDTO;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -46,5 +44,22 @@ public interface PowerAxisStructDao extends BaseDao<PowerAxisStructEntity> {
     List<PowerAxisStructListResultDTO> queryList();
 
 
-    int addOrg(PowerAxisStructAddFormDTO form);
+    void delete(String id);
+
+    /**
+     * 获取上级网格党支部
+     */
+    List<PowerAxisStructGridPartyBranchResultDTO> getGridPartyBranchList();
+
+    /**
+     * 获取pid
+     */
+    List<String> getPid();
+
+    /**
+     * 获取上级党委
+     */
+    List<PowerAxisStructPartyCommResultDTO> getPartyCommList();
+
+
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java

@@ -6,10 +6,8 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.plugin.power.dto.axis.PowerAxisStructDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructAddFormDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructFormDTO;
-import com.epmet.plugin.power.dto.axis.result.PowerAxisStructListResultDTO;
+import com.epmet.plugin.power.dto.axis.result.*;
-import com.epmet.plugin.power.dto.axis.result.PowerAxisStructResultDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructLeaderFormDTO;
-import com.epmet.plugin.power.dto.axis.result.PowerAxisStructLeaderResultDTO;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructEntity;
 
 import java.util.List;
@@ -106,5 +104,39 @@ public interface PowerAxisStructService extends BaseService<PowerAxisStructEntit
     /**
      * 添加组织
      */
-    int addOrg(PowerAxisStructAddFormDTO form);
+    int addOrg(PowerAxisStructEntity form);
+
+    /**
+     * 修改组织
+     */
+    int modifyRog(PowerAxisStructEntity form);
+
+    /**
+     * 删除
+     * @param id
+     */
+    void delete(String id);
+
+    /**
+     * 获取上级网格党支部
+     */
+    List<PowerAxisStructGridPartyBranchResultDTO> getGridPartyBranchList();
+
+    /**
+     * 查询父id
+     * @return String
+     */
+    List<String> getPid();
+
+    /**
+     * 获取上级党委列表
+     */
+    List<PowerAxisStructPartyCommResultDTO> getPartyCommList();
+
+    /**
+     * 根据id查询修改表单数据
+     */
+    PowerAxisStructEntity queryModifyById(String id);
+
+
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java

@@ -11,9 +11,7 @@ import com.epmet.plugin.power.dto.axis.PowerAxisStructDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructAddFormDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructFormDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructLeaderFormDTO;
-import com.epmet.plugin.power.dto.axis.result.PowerAxisStructLeaderResultDTO;
+import com.epmet.plugin.power.dto.axis.result.*;
-import com.epmet.plugin.power.dto.axis.result.PowerAxisStructListResultDTO;
-import com.epmet.plugin.power.dto.axis.result.PowerAxisStructResultDTO;
 import com.epmet.plugin.power.modules.axis.dao.PowerAxisStructDao;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructEntity;
 import com.epmet.plugin.power.modules.axis.redis.PowerAxisStructRedis;
@@ -115,8 +113,52 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
     }
 
     @Override
-    public int addOrg(PowerAxisStructAddFormDTO form) {
+    public int addOrg(PowerAxisStructEntity form) {
-       int i = baseDao.addOrg(form);
+       int i = baseDao.insert(form);
        return i;
     }
+
+    @Override
+    public int modifyRog(PowerAxisStructEntity form) {
+        if(form.getId().equals( form.getPid())){
+            System.out.println("11111");
+            return 0;
+        }
+        int i = baseDao.updateById(form);
+        return i;
+    }
+
+    @Override
+    public void delete(String id) {
+        baseDao.delete(id);
+    }
+
+    /**
+     * 获取上级网格党支部
+     */
+    @Override
+    public List<PowerAxisStructGridPartyBranchResultDTO> getGridPartyBranchList() {
+        List<PowerAxisStructGridPartyBranchResultDTO> list = baseDao.getGridPartyBranchList();
+        return list;
+    }
+
+    @Override
+    public List<String> getPid() {
+        List<String> pid = baseDao.getPid();
+        return pid;
+    }
+
+    @Override
+    public List<PowerAxisStructPartyCommResultDTO> getPartyCommList() {
+        List<PowerAxisStructPartyCommResultDTO> list = baseDao.getPartyCommList();
+        return list;
+    }
+
+    @Override
+    public PowerAxisStructEntity queryModifyById(String id) {
+        PowerAxisStructEntity entity = baseDao.selectById(id);
+        return entity;
+    }
+
+
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml

@@ -21,25 +21,16 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
-    <insert id="addOrg">
+    <delete id="delete">
-        INSERT INTO
+        DELETE
+        FROM
             pli_power_axis_struct
-            (name,
+        WHERE
-            CUSTOMER_ID,
+            id = #{id}
-            sort,
+        AND
-            CATEGORY_CODE,
+            del_flag = 0
-            AGENCY_ID,
+    </delete>
-            AGENCY_NAME,
+
-            AGENCY_TYPE)
-        VALUES
-            (#{name},
-            #{customerId},
-            #{sort},
-            #{categoryCode},
-            #{agencyId},
-            #{agencyName},
-            #{agencyType})
-    </insert>
 
     <select id="selectAllForTree"
             resultType="com.epmet.plugin.power.dto.axis.result.PowerAxisStructLeaderResultDTO">
@@ -97,6 +88,42 @@
 	        pli_power_axis_struct
 	    where del_flag = 0
     </select>
+    <select id="getGridPartyBranchList"
+            resultType="com.epmet.plugin.power.dto.axis.result.PowerAxisStructGridPartyBranchResultDTO">
+        SELECT
+            id,
+            NAME
+        FROM
+            pli_power_axis_struct
+        WHERE
+	        CATEGORY_CODE = 'grid_party'
+	    AND
+	        del_flag = 0
+    </select>
+    <select id="getPid" resultType="java.lang.String">
+        SELECT
+	        id AS pid
+        FROM
+	        ( SELECT
+	            id
+	          FROM
+	            pli_power_axis_struct
+	          WHERE
+	            CATEGORY_CODE = 'community_party' )
+	          AS a
+    </select>
+    <select id="getPartyCommList"
+            resultType="com.epmet.plugin.power.dto.axis.result.PowerAxisStructPartyCommResultDTO">
+        SELECT
+            id,
+            NAME
+        FROM
+            pli_power_axis_struct
+        WHERE
+	        CATEGORY_CODE = 'community_party'
+	    AND
+	        del_flag = 0
+    </select>
 
 
 </mapper>