Revert "Revert "微网格初始化""

This reverts commit be0e4bb2b2.

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/MicroGridDTO.java

@@ -0,0 +1,141 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 微网格表 
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-10-27
+ */
+@Data
+public class MicroGridDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 微网格名称
+     */
+	private String microgridName;
+
+    /**
+     * 微网格长
+     */
+	private String contacts;
+
+    /**
+     * 性别(女性-0，男性-1)
+     */
+	private String sex;
+
+    /**
+     * 联系电话
+     */
+	private String mobile;
+
+    /**
+     * 地址
+     */
+	private String address;
+
+    /**
+     * 所属组织机构ID
+     */
+	private String pid;
+
+    /**
+     * 所有上级组织ID
+     */
+	private String pids;
+
+    /**
+     * 当前网格总人数
+     */
+	private Integer totalUser;
+
+    /**
+     * 网格排序
+     */
+	private Integer sort;
+
+    /**
+     * 中心位置纬度
+     */
+	private String latitude;
+
+    /**
+     * 中心点位地址
+     */
+	private String centerAddress;
+
+    /**
+     * 坐标区域
+     */
+	private String coordinates;
+
+    /**
+     * 编码
+     */
+	private String code;
+
+    /**
+     * 删除标识:0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/MicroGridController.java

@@ -0,0 +1,93 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.MicroGridDTO;
+import com.epmet.excel.MicroGridExcel;
+import com.epmet.service.MicroGridService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 微网格表 
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-10-27
+ */
+@RestController
+@RequestMapping("microgrid")
+public class MicroGridController {
+    
+    @Autowired
+    private MicroGridService microGridService;
+
+    @GetMapping("page")
+    public Result<PageData<MicroGridDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<MicroGridDTO> page = microGridService.page(params);
+        return new Result<PageData<MicroGridDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<MicroGridDTO> get(@PathVariable("id") String id){
+        MicroGridDTO data = microGridService.get(id);
+        return new Result<MicroGridDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody MicroGridDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        microGridService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody MicroGridDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        microGridService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        microGridService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<MicroGridDTO> list = microGridService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, MicroGridExcel.class);
+    }
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/MicroGridDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.MicroGridEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 微网格表 
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-10-27
+ */
+@Mapper
+public interface MicroGridDao extends BaseDao<MicroGridEntity> {
+	
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/MicroGridEntity.java

@@ -0,0 +1,110 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+ * 微网格表 
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-10-27
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("micro_grid")
+public class MicroGridEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 微网格名称
+     */
+	private String microgridName;
+
+    /**
+     * 微网格长
+     */
+	private String contacts;
+
+    /**
+     * 性别(女性-0，男性-1)
+     */
+	private String sex;
+
+    /**
+     * 联系电话
+     */
+	private String mobile;
+
+    /**
+     * 地址
+     */
+	private String address;
+
+    /**
+     * 所属组织机构ID
+     */
+	private String pid;
+
+    /**
+     * 所有上级组织ID
+     */
+	private String pids;
+
+    /**
+     * 当前网格总人数
+     */
+	private Integer totalUser;
+
+    /**
+     * 网格排序
+     */
+	private Integer sort;
+
+    /**
+     * 中心位置纬度
+     */
+	private String latitude;
+
+    /**
+     * 中心点位地址
+     */
+	private String centerAddress;
+
+    /**
+     * 坐标区域
+     */
+	private String coordinates;
+
+    /**
+     * 编码
+     */
+	private String code;
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/MicroGridExcel.java

@@ -0,0 +1,98 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 微网格表 
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-10-27
+ */
+@Data
+public class MicroGridExcel {
+
+    @Excel(name = "ID 唯一标识")
+    private String id;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "微网格名称")
+    private String microgridName;
+
+    @Excel(name = "微网格长")
+    private String contacts;
+
+    @Excel(name = "性别(女性-0，男性-1)")
+    private String sex;
+
+    @Excel(name = "联系电话")
+    private String mobile;
+
+    @Excel(name = "地址")
+    private String address;
+
+    @Excel(name = "所属组织机构ID")
+    private String pid;
+
+    @Excel(name = "所有上级组织ID")
+    private String pids;
+
+    @Excel(name = "当前网格总人数")
+    private Integer totalUser;
+
+    @Excel(name = "网格排序")
+    private Integer sort;
+
+    @Excel(name = "中心位置纬度")
+    private String latitude;
+
+    @Excel(name = "中心点位地址")
+    private String centerAddress;
+
+    @Excel(name = "坐标区域")
+    private String coordinates;
+
+    @Excel(name = "编码")
+    private String code;
+
+    @Excel(name = "删除标识:0.未删除 1.已删除")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/MicroGridService.java

@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.MicroGridDTO;
+import com.epmet.entity.MicroGridEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 微网格表 
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-10-27
+ */
+public interface MicroGridService extends BaseService<MicroGridEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<MicroGridDTO>
+     * @author generator
+     * @date 2023-10-27
+     */
+    PageData<MicroGridDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<MicroGridDTO>
+     * @author generator
+     * @date 2023-10-27
+     */
+    List<MicroGridDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return MicroGridDTO
+     * @author generator
+     * @date 2023-10-27
+     */
+    MicroGridDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2023-10-27
+     */
+    void save(MicroGridDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2023-10-27
+     */
+    void update(MicroGridDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2023-10-27
+     */
+    void delete(String[] ids);
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/MicroGridServiceImpl.java

@@ -0,0 +1,102 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.MicroGridDao;
+import com.epmet.dto.MicroGridDTO;
+import com.epmet.entity.MicroGridEntity;
+import com.epmet.service.MicroGridService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 微网格表 
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-10-27
+ */
+@Service
+public class MicroGridServiceImpl extends BaseServiceImpl<MicroGridDao, MicroGridEntity> implements MicroGridService {
+
+
+
+    @Override
+    public PageData<MicroGridDTO> page(Map<String, Object> params) {
+        IPage<MicroGridEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, MicroGridDTO.class);
+    }
+
+    @Override
+    public List<MicroGridDTO> list(Map<String, Object> params) {
+        List<MicroGridEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, MicroGridDTO.class);
+    }
+
+    private QueryWrapper<MicroGridEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<MicroGridEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public MicroGridDTO get(String id) {
+        MicroGridEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, MicroGridDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(MicroGridDTO dto) {
+        MicroGridEntity entity = ConvertUtils.sourceToTarget(dto, MicroGridEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(MicroGridDTO dto) {
+        MicroGridEntity entity = ConvertUtils.sourceToTarget(dto, MicroGridEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/MicroGridDao.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.MicroGridDao">
+
+    <resultMap type="com.epmet.entity.MicroGridEntity" id="microGridMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="microgridName" column="MICROGRID_NAME"/>
+        <result property="contacts" column="CONTACTS"/>
+        <result property="sex" column="SEX"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="address" column="ADDRESS"/>
+        <result property="pid" column="PID"/>
+        <result property="pids" column="PIDS"/>
+        <result property="totalUser" column="TOTAL_USER"/>
+        <result property="sort" column="sort"/>
+        <result property="latitude" column="LATITUDE"/>
+        <result property="centerAddress" column="CENTER_ADDRESS"/>
+        <result property="coordinates" column="COORDINATES"/>
+        <result property="code" column="CODE"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>