修改模块

interface-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/InstitutionApi.java

@@ -0,0 +1,112 @@
+package cn.com.tenlion.institutionmanagement.service.institution;
+
+import cn.com.tenlion.institutionmanagement.pojo.bos.institution.InstitutionBO;
+import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO;
+import cn.com.tenlion.institutionmanagement.pojo.pos.institution.InstitutionPO;
+import cn.com.tenlion.institutionmanagement.pojo.vos.institution.InstitutionVO;
+import ink.wgink.pojo.ListPage;
+import ink.wgink.pojo.result.SuccessResultList;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName: IInstitutionService
+ * @Description: 机构管理
+ * @Author: CodeFactory
+ * @Date: 2021-04-28 17:58:49
+ * @Version: 3.0
+ **/
+public interface InstitutionApi {
+
+
+    /**
+     * 机构管理详情
+     *
+     * @param params 参数Map
+     * @return
+     */
+    InstitutionDTO get(Map<String, Object> params);
+
+    /**
+     * 机构管理详情
+     *
+     * @param institutionId
+     * @return
+     */
+    InstitutionDTO get(String institutionId);
+
+    /**
+     * 机构管理详情
+     *
+     * @param params 参数Map
+     * @return
+     */
+    InstitutionBO getBO(Map<String, Object> params);
+
+    /**
+     * 机构管理详情
+     *
+     * @param institutionId
+     * @return
+     */
+    InstitutionBO getBO(String institutionId);
+
+    /**
+     * 机构管理详情
+     *
+     * @param params 参数Map
+     * @return
+     */
+    InstitutionPO getPO(Map<String, Object> params);
+
+    /**
+     * 机构管理详情
+     *
+     * @param institutionId
+     * @return
+     */
+    InstitutionPO getPO(String institutionId);
+
+    /**
+     * 机构管理列表
+     *
+     * @param params
+     * @return
+     */
+    List<InstitutionDTO> list(Map<String, Object> params);
+
+    /**
+     * 机构管理列表
+     *
+     * @param params
+     * @return
+     */
+    List<InstitutionBO> listBO(Map<String, Object> params);
+
+    /**
+     * 机构管理列表
+     *
+     * @param params
+     * @return
+     */
+    List<InstitutionPO> listPO(Map<String, Object> params);
+
+    /**
+     * 机构管理分页列表
+     *
+     * @param page
+     * @return
+     */
+    SuccessResultList<List<InstitutionDTO>> listPage(ListPage page);
+
+    /**
+     * 机构管理统计
+     *
+     * @param params
+     * @return
+     */
+    Integer count(Map<String, Object> params);
+
+}

interface-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/service/organization/OrganizationApi.java

@@ -0,0 +1,117 @@
+package cn.com.tenlion.organizationmanagement.service.organization;
+
+import ink.wgink.pojo.ListPage;
+import ink.wgink.pojo.result.SuccessResultList;
+import cn.com.tenlion.organizationmanagement.pojo.dtos.organization.OrganizationDTO;
+import cn.com.tenlion.organizationmanagement.pojo.vos.organization.OrganizationVO;
+import cn.com.tenlion.organizationmanagement.pojo.bos.organization.OrganizationBO;
+import cn.com.tenlion.organizationmanagement.pojo.pos.organization.OrganizationPO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName: IOrganizationService
+ * @Description: 组织管理
+ * @Author: CodeFactory
+ * @Date: 2021-04-28 11:06:42
+ * @Version: 3.0
+ **/
+public interface OrganizationApi {
+
+
+
+
+
+
+
+
+    /**
+     * 组织管理详情
+     *
+     * @param params 参数Map
+     * @return
+     */
+    OrganizationDTO get(Map<String, Object> params);
+
+    /**
+     * 组织管理详情
+     *
+     * @param organizationId
+     * @return
+     */
+    OrganizationDTO get(String organizationId);
+
+    /**
+     * 组织管理详情
+     *
+     * @param params 参数Map
+     * @return
+     */
+    OrganizationBO getBO(Map<String, Object> params);
+
+    /**
+     * 组织管理详情
+     *
+     * @param organizationId
+     * @return
+     */
+    OrganizationBO getBO(String organizationId);
+
+    /**
+     * 组织管理详情
+     *
+     * @param params 参数Map
+     * @return
+     */
+    OrganizationPO getPO(Map<String, Object> params);
+
+    /**
+     * 组织管理详情
+     *
+     * @param organizationId
+     * @return
+     */
+    OrganizationPO getPO(String organizationId);
+
+    /**
+     * 组织管理列表
+     *
+     * @param params
+     * @return
+     */
+    List<OrganizationDTO> list(Map<String, Object> params);
+
+    /**
+     * 组织管理列表
+     *
+     * @param params
+     * @return
+     */
+    List<OrganizationBO> listBO(Map<String, Object> params);
+
+    /**
+     * 组织管理列表
+     *
+     * @param params
+     * @return
+     */
+    List<OrganizationPO> listPO(Map<String, Object> params);
+
+    /**
+     * 组织管理分页列表
+     *
+     * @param page
+     * @return
+     */
+    SuccessResultList<List<OrganizationDTO>> listPage(ListPage page);
+
+    /**
+     * 组织管理统计
+     *
+     * @param params
+     * @return
+     */
+    Integer count(Map<String, Object> params);
+
+}

module-institution-management/pom.xml

@@ -18,6 +18,7 @@
             <artifactId>interface-institution-management</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+
         <dependency>
             <groupId>ink.wgink</groupId>
             <artifactId>module-dictionary</artifactId>
@@ -25,6 +26,8 @@
             <scope>compile</scope>
         </dependency>
 
+
+
     </dependencies>
 
 

module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/impl/InstitutionServiceImpl.java

@@ -6,9 +6,9 @@ import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO
 import cn.com.tenlion.institutionmanagement.pojo.pos.institution.InstitutionPO;
 import cn.com.tenlion.institutionmanagement.pojo.vos.institution.InstitutionVO;
 import cn.com.tenlion.institutionmanagement.service.institution.IInstitutionService;
+import cn.com.tenlion.institutionmanagement.service.institution.InstitutionApi;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.pojo.ListPage;
-import ink.wgink.pojo.result.SuccessResult;
 import ink.wgink.pojo.result.SuccessResultList;
 import ink.wgink.util.map.HashMapUtil;
 import ink.wgink.util.UUIDUtil;
@@ -29,7 +29,7 @@ import java.util.*;
  * @Version: 3.0
  **/
 @Service
-public class InstitutionServiceImpl extends DefaultBaseService implements IInstitutionService {
+public class InstitutionServiceImpl extends DefaultBaseService implements IInstitutionService,InstitutionApi {
 
     @Autowired
     private IInstitutionDao institutionDao;

module-institution-management/src/main/resources/templates/institution/list.html

@@ -116,24 +116,6 @@
                                 return rowData;
                             }
                         },
-                        {field: 'institutionDesc', width: 180, title: '机构描述', align:'center',
-                            templet: function(row) {
-                                var rowData = row[this.field];
-                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                    return '-';
-                                }
-                                return rowData;
-                            }
-                        },
-                        {field: 'institutionAddress', width: 350, title: '机构详情地址', align:'center',
-                            templet: function(row) {
-                                var rowData = row[this.field];
-                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                    return '-';
-                                }
-                                return rowData;
-                            }
-                        },
                         {field: 'institutionFoundingTime', width: 180, title: '机构成立时间', align:'center',
                             templet: function(row) {
                                 var rowData = row[this.field];
@@ -152,7 +134,7 @@
                                 return rowData;
                             }
                         },
-                        {field: 'institutionContact', width: 180, title: '机构联系方式', align:'center',
+                        {field: 'institutionContact', width: 250, title: '机构联系方式', align:'center',
                             templet: function(row) {
                                 var rowData = row[this.field];
                                 if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@@ -161,6 +143,25 @@
                                 return rowData;
                             }
                         },
+                        {field: 'institutionAddress', width: 350, title: '机构详情地址', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'institutionDesc', width: 180, title: '机构描述', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+
                     ]
                 ],
                 page: true,

module-institution-management/src/main/resources/templates/institution/save.html

@@ -39,7 +39,7 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">机构名称</label>
                     <div class="layui-input-block">
-                        <input type="text" id="institutionName" name="institutionName" class="layui-input" value="" placeholder="请输入机构名称"  maxlength="255">
+                        <input type="text" id="institutionName" name="institutionName" class="layui-input" value="" placeholder="请输入机构名称"  maxlength="255" lay-verify="required">
                     </div>
                 </div>
                 <div class="layui-form-item layui-form-text">
@@ -110,7 +110,7 @@
                     </div>
                     <div class="layui-input-inline">
                         <select name="institutionRegionArea" id="institutionRegionArea" lay-filter="institutionRegionArea">
-                            <option value="">请选择区</option>
+                            <option value="">请选择县</option>
                         </select>
                     </div>
                     <div class="layui-input-inline">
@@ -120,12 +120,12 @@
                     </div>
                     <div class="layui-input-inline">
                         <select name="institutionRegionStreet" id="institutionRegionStreet" lay-filter="institutionRegionStreet">
-                            <option value="">请选择街</option>
+                            <option value="">请选择村</option>
                         </select>
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">机构地址</label>
+                    <label class="layui-form-label">机构详细地址</label>
                     <div class="layui-input-block">
                         <input type="hidden" id="institutionX" name="institutionX" value="" placeholder="请输入机构经度">
                         <input type="hidden" id="institutionY" name="institutionY" value="" placeholder="请输入机构纬度">
@@ -167,7 +167,7 @@
         var wangEditor = window.wangEditor;
         var wangEditorObj = {};
         var viewerObj = {};
-        var dictId = 'cce46439-d5de-4687-8a9b-cb22817daad5';
+        var dictId = '0';
 
         function closeBox() {
             parent.layer.close(parent.layer.getFrameIndex(window.name));
@@ -361,7 +361,7 @@
 
         //c初始化数据字典
         function initDataDict(dictId,tabId){
-            top.restAjax.get(top.restAjax.path("api/data/listbyparentid/{dataParentId}",[dictId]),{},null,function (code,data,args) {
+            top.restAjax.get(top.restAjax.path("api/area/listallbyparentid/{areaParentId}",[dictId]),{},null,function (code,data,args) {
                 $("#"+tabId).empty();
                 var html = '';
                 if ('institutionRegionProvince' === tabId){
@@ -371,17 +371,17 @@
                     html += '<option value="">请选择市</option>';
                 }
                 if ('institutionRegionArea' === tabId){
-                    html += '<option value="">请选择区</option>';
+                    html += '<option value="">请选择县</option>';
                 }
                 if ('institutionRegionVillage' === tabId){
-                    html += '<option value="">请选择镇/村</option>';
+                    html += '<option value="">请选择镇</option>';
                 }
                 if ('institutionRegionStreet' === tabId){
-                    html += '<option value="">请选择街</option>';
+                    html += '<option value="">请选择村</option>';
                 }
 
                 $.each(data, function (index, item) {
-                    html += '<option value="'+item.dataId+'">'+item.dataName+'</option>';
+                    html += '<option value="'+item.areaId+'">'+item.areaName+'</option>';
                 });
                 $("#"+tabId).append(html);
                 form.render('select');

module-institution-management/src/main/resources/templates/institution/update.html

@@ -39,7 +39,7 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">机构名称</label>
                     <div class="layui-input-block">
-                        <input type="text" id="institutionName" name="institutionName" class="layui-input" value="" placeholder="请输入机构名称"  maxlength="255">
+                        <input type="text" id="institutionName" name="institutionName" class="layui-input" value="" placeholder="请输入机构名称"  maxlength="255" lay-verify="required">
                     </div>
                 </div>
                 <div class="layui-form-item layui-form-text">
@@ -81,7 +81,7 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">机构成立时间</label>
                     <div class="layui-input-block">
-                        <input type="text" id="institutionFoundingTime" name="institutionFoundingTime" class="layui-input" value="" placeholder="请选择机构成立时间" lay-verify="required" readonly style="cursor: pointer;">
+                        <input type="text" id="institutionFoundingTime" name="institutionFoundingTime" class="layui-input" value="" placeholder="请选择机构成立时间" readonly style="cursor: pointer;" lay-verify="required">
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -110,7 +110,7 @@
                     </div>
                     <div class="layui-input-inline">
                         <select name="institutionRegionArea" id="institutionRegionArea" lay-filter="institutionRegionArea">
-                            <option value="">请选择区</option>
+                            <option value="">请选择县</option>
                         </select>
                     </div>
                     <div class="layui-input-inline">
@@ -120,12 +120,12 @@
                     </div>
                     <div class="layui-input-inline">
                         <select name="institutionRegionStreet" id="institutionRegionStreet" lay-filter="institutionRegionStreet">
-                            <option value="">请选择街</option>
+                            <option value="">请选择村</option>
                         </select>
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">机构地址</label>
+                    <label class="layui-form-label">机构详细地址</label>
                     <div class="layui-input-block">
                         <input type="hidden" id="institutionX" name="institutionX" value="" placeholder="请输入机构经度">
                         <input type="hidden" id="institutionY" name="institutionY" value="" placeholder="请输入机构纬度">
@@ -165,7 +165,7 @@
         var laytpl = layui.laytpl;
         var laydate = layui.laydate;
         var institutionId = top.restAjax.params(window.location.href).institutionId;
-        var dictId = 'cce46439-d5de-4687-8a9b-cb22817daad5';
+        var dictId = '0';
 
         var wangEditor = window.wangEditor;
         var wangEditorObj = {};
@@ -352,6 +352,10 @@
 
         //初始化百度地图
         function initMap(longitude, latitude) {
+            if (longitude == '' || latitude == ''){
+                longitude = '109.85017859252311';
+                latitude = '40.66017700460503';
+            }
             map = new BMap.Map("mapContainer", {enableMapClick: false,});
             var point = new BMap.Point(longitude, latitude);
             map.centerAndZoom(point, 13);
@@ -388,7 +392,7 @@
             if(dictId == null || dictId == ''){
                 return;
             }
-            top.restAjax.get(top.restAjax.path("api/data/listbyparentid/{dataParentId}",[dictId]),{},null,function (code,data,args) {
+            top.restAjax.get(top.restAjax.path("api/area/listallbyparentid/{areaParentId}",[dictId]),{},null,function (code,data,args) {
                 $("#"+tabId).empty();
                 var html = '';
                 if ('institutionRegionProvince' === tabId){
@@ -398,20 +402,20 @@
                     html += '<option value="">请选择市</option>';
                 }
                 if ('institutionRegionArea' === tabId){
-                    html += '<option value="">请选择区</option>';
+                    html += '<option value="">请选择县</option>';
                 }
                 if ('institutionRegionVillage' === tabId){
-                    html += '<option value="">请选择镇/村</option>';
+                    html += '<option value="">请选择镇</option>';
                 }
                 if ('institutionRegionStreet' === tabId){
-                    html += '<option value="">请选择街</option>';
+                    html += '<option value="">请选择村</option>';
                 }
 
                 $.each(data, function (index, item) {
-                    if(selectVelue ==  item.dataId){
+                    if(selectVelue ==  item.areaId){
-                        html += '<option selected value="'+item.dataId+'">'+item.dataName+'</option>';
+                        html += '<option  selected value="'+item.areaId+'">'+item.areaName+'</option>';
                     }else{
-                        html += '<option value="'+item.dataId+'">'+item.dataName+'</option>';
+                        html += '<option value="'+item.areaId+'">'+item.areaName+'</option>';
                     }
                 });
                 $("#"+tabId).append(html);

module-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/controller/api/organization/OrganizationController.java

@@ -1,5 +1,6 @@
 package cn.com.tenlion.organizationmanagement.controller.api.organization;
 
+import cn.com.tenlion.organizationmanagement.service.organization.IOrganizationService;
 import ink.wgink.annotation.CheckRequestBodyAnnotation;
 import ink.wgink.common.base.DefaultBaseController;
 import ink.wgink.interfaces.consts.ISystemConstant;
@@ -10,7 +11,7 @@ import ink.wgink.pojo.result.SuccessResultData;
 import ink.wgink.pojo.result.SuccessResultList;
 import cn.com.tenlion.organizationmanagement.pojo.dtos.organization.OrganizationDTO;
 import cn.com.tenlion.organizationmanagement.pojo.vos.organization.OrganizationVO;
-import cn.com.tenlion.organizationmanagement.service.organization.IOrganizationService;
+import cn.com.tenlion.organizationmanagement.service.organization.OrganizationApi;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

module-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/controller/route/organization/OrganizationRouteController.java

@@ -2,16 +2,10 @@ package cn.com.tenlion.organizationmanagement.controller.route.organization;
 
 import ink.wgink.common.base.DefaultBaseController;
 import ink.wgink.interfaces.consts.ISystemConstant;
-import cn.com.tenlion.organizationmanagement.service.organization.IOrganizationService;
 import io.swagger.annotations.*;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
 /**
  * @ClassName: OrganizationController
  * @Description: 组织管理

module-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/service/organization/impl/OrganizationServiceImpl.java

@@ -1,17 +1,18 @@
 package cn.com.tenlion.organizationmanagement.service.organization.impl;
 
+import cn.com.tenlion.organizationmanagement.dao.organization.IOrganizationDao;
+import cn.com.tenlion.organizationmanagement.service.organization.IOrganizationService;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.pojo.ListPage;
-import ink.wgink.pojo.result.SuccessResult;
 import ink.wgink.pojo.result.SuccessResultList;
 import ink.wgink.util.map.HashMapUtil;
 import ink.wgink.util.UUIDUtil;
-import cn.com.tenlion.organizationmanagement.dao.organization.IOrganizationDao;
+
 import cn.com.tenlion.organizationmanagement.pojo.dtos.organization.OrganizationDTO;
 import cn.com.tenlion.organizationmanagement.pojo.vos.organization.OrganizationVO;
 import cn.com.tenlion.organizationmanagement.pojo.bos.organization.OrganizationBO;
 import cn.com.tenlion.organizationmanagement.pojo.pos.organization.OrganizationPO;
-import cn.com.tenlion.organizationmanagement.service.organization.IOrganizationService;
+import cn.com.tenlion.organizationmanagement.service.organization.OrganizationApi;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
@@ -30,7 +31,7 @@ import java.util.*;
  **/
 @Primary
 @Service
-public class OrganizationServiceImpl extends DefaultBaseService implements IOrganizationService {
+public class OrganizationServiceImpl extends DefaultBaseService implements IOrganizationService,OrganizationApi {
 
     @Autowired
     private IOrganizationDao organizationDao;

module-organization-management/src/main/resources/templates/organization/save.html

@@ -39,13 +39,13 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">组织名称</label>
                     <div class="layui-input-block">
-                        <input type="text" id="organizationName" name="organizationName" class="layui-input" value="" placeholder="请输入组织名称"  maxlength="255">
+                        <input type="text" id="organizationName" name="organizationName" class="layui-input" value="" placeholder="请输入组织名称"  maxlength="255" lay-verify="required">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">组织人员数量</label>
                     <div class="layui-input-block">
-                        <input type="number" id="organizationUserNum" name="organizationUserNum" class="layui-input" value="" placeholder="请输入组织人员数量" lay-verify="required">
+                        <input type="number" id="organizationUserNum" name="organizationUserNum" class="layui-input" value="" placeholder="请输入组织人员数量" >
                     </div>
                 </div>
                 <div class="layui-form-item">

module-organization-management/src/main/resources/templates/organization/update.html

@@ -39,13 +39,13 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">组织名称</label>
                     <div class="layui-input-block">
-                        <input type="text" id="organizationName" name="organizationName" class="layui-input" value="" placeholder="请输入组织名称"  maxlength="255">
+                        <input type="text" id="organizationName" name="organizationName" class="layui-input" value="" placeholder="请输入组织名称"  maxlength="255" lay-verify="required">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">组织人员数量</label>
                     <div class="layui-input-block">
-                        <input type="number" id="organizationUserNum" name="organizationUserNum" class="layui-input" value="" placeholder="请输入组织人员数量" lay-verify="required">
+                        <input type="number" id="organizationUserNum" name="organizationUserNum" class="layui-input" value="" placeholder="请输入组织人员数量">
                     </div>
                 </div>
                 <div class="layui-form-item">

pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/vos/institution/InstitutionVO.java

@@ -29,7 +29,6 @@ public class InstitutionVO {
     @ApiModelProperty(name = "institutionY", value = "机构纬度")
     private String institutionY;
     @ApiModelProperty(name = "institutionFoundingTime", value = "机构成立时间")
-    @CheckEmptyAnnotation(name = "机构成立时间", verifyType = "datetime")
     private String institutionFoundingTime;
     @ApiModelProperty(name = "institutionPrincipal", value = "机构负责人")
     private String institutionPrincipal;

pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/vos/organization/OrganizationVO.java

@@ -19,7 +19,6 @@ public class OrganizationVO {
     @ApiModelProperty(name = "organizationName", value = "组织名称")
     private String organizationName;
     @ApiModelProperty(name = "organizationUserNum", value = "组织人员数量")
-    @CheckNumberAnnotation(name = "组织人员数量")
     private Integer organizationUserNum;
     @ApiModelProperty(name = "organizationPrincipal", value = "组织负责人")
     private String organizationPrincipal;