Tenlion/tenlion-module
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of e.coding.net:tsteam/xiangmumokuai/tenlion-module

Browse Source
This commit is contained in:
wans 2021-05-02 10:06:59 +08:00
commit e37e0ba16a
28 changed files with 1069 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
interface-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/InstitutionApi.java Normal file
View File

@ -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);
}

117
interface-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/service/organization/OrganizationApi.java Normal file
View File

@ -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);
}

10
module-institution-management/pom.xml
View File

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

4
module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/controller/route/institution/InstitutionRouteController.java
View File

@ -39,4 +39,8 @@ public class InstitutionRouteController extends DefaultBaseController {
return new ModelAndView("institution/list"); return new ModelAndView("institution/list");
} }
@GetMapping("baidumap")
public ModelAndView baiDuMap(){return new ModelAndView("baidumap/map-baidu.html");}
} }

7
module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/dao/institution/IInstitutionDao.java
View File

@ -1,12 +1,13 @@
package cn.com.tenlion.institutionmanagement.dao.institution; package cn.com.tenlion.institutionmanagement.dao.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 ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.RemoveException;
import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SaveException;
import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.SearchException;
import ink.wgink.exceptions.UpdateException; import ink.wgink.exceptions.UpdateException;
import cn.com.tenlion.pojo.bos.institution.InstitutionBO;
import cn.com.tenlion.pojo.pos.institution.InstitutionPO;
import cn.com.tenlion.pojo.dtos.institution.InstitutionDTO;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.List; import java.util.List;

0
interface-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/IInstitutionService.java → module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/IInstitutionService.java
View File

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

@ -1,17 +1,18 @@
package cn.com.tenlion.institutionmanagement.service.institution.impl; package cn.com.tenlion.institutionmanagement.service.institution.impl;
import cn.com.tenlion.institutionmanagement.dao.institution.IInstitutionDao;
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 cn.com.tenlion.institutionmanagement.service.institution.IInstitutionService;
import cn.com.tenlion.institutionmanagement.service.institution.InstitutionApi;
import ink.wgink.common.base.DefaultBaseService; import ink.wgink.common.base.DefaultBaseService;
import ink.wgink.pojo.ListPage; import ink.wgink.pojo.ListPage;
import ink.wgink.pojo.result.SuccessResult;
import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.pojo.result.SuccessResultList;
import ink.wgink.util.map.HashMapUtil; import ink.wgink.util.map.HashMapUtil;
import ink.wgink.util.UUIDUtil; import ink.wgink.util.UUIDUtil;
import cn.com.tenlion.dao.institution.IInstitutionDao;
import cn.com.tenlion.pojo.dtos.institution.InstitutionDTO;
import cn.com.tenlion.pojo.vos.institution.InstitutionVO;
import cn.com.tenlion.pojo.bos.institution.InstitutionBO;
import cn.com.tenlion.pojo.pos.institution.InstitutionPO;
import cn.com.tenlion.service.institution.IInstitutionService;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -28,7 +29,7 @@ import java.util.*;
* @Version: 3.0 * @Version: 3.0
**/ **/
@Service @Service
public class InstitutionServiceImpl extends DefaultBaseService implements IInstitutionService { public class InstitutionServiceImpl extends DefaultBaseService implements IInstitutionService,InstitutionApi {
@Autowired @Autowired
private IInstitutionDao institutionDao; private IInstitutionDao institutionDao;

96
module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.com.tenlion.dao.institution.IInstitutionDao"> <mapper namespace="cn.com.tenlion.institutionmanagement.dao.institution.IInstitutionDao">
<resultMap id="institutionDTO" type="cn.com.tenlion.pojo.dtos.institution.InstitutionDTO"> <resultMap id="institutionDTO" type="cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO">
<result column="institution_id" property="institutionId"/> <result column="institution_id" property="institutionId"/>
<result column="institution_name" property="institutionName"/> <result column="institution_name" property="institutionName"/>
<result column="institution_desc" property="institutionDesc"/> <result column="institution_desc" property="institutionDesc"/>
@ -18,11 +18,12 @@
<result column="institution_region_area" property="institutionRegionArea"/> <result column="institution_region_area" property="institutionRegionArea"/>
<result column="institution_region_village" property="institutionRegionVillage"/> <result column="institution_region_village" property="institutionRegionVillage"/>
<result column="institution_region_street" property="institutionRegionStreet"/> <result column="institution_region_street" property="institutionRegionStreet"/>
<result column="institution_type" property="institutionType"/>
<result column="creator" property="creator"/> <result column="creator" property="creator"/>
<result column="gmt_create" property="gmtCreate"/> <result column="gmt_create" property="gmtCreate"/>
</resultMap> </resultMap>
<resultMap id="institutionBO" type="cn.com.tenlion.pojo.bos.institution.InstitutionBO"> <resultMap id="institutionBO" type="cn.com.tenlion.institutionmanagement.pojo.bos.institution.InstitutionBO">
<result column="institution_id" property="institutionId"/> <result column="institution_id" property="institutionId"/>
<result column="institution_name" property="institutionName"/> <result column="institution_name" property="institutionName"/>
<result column="institution_desc" property="institutionDesc"/> <result column="institution_desc" property="institutionDesc"/>
@ -38,6 +39,7 @@
<result column="institution_region_area" property="institutionRegionArea"/> <result column="institution_region_area" property="institutionRegionArea"/>
<result column="institution_region_village" property="institutionRegionVillage"/> <result column="institution_region_village" property="institutionRegionVillage"/>
<result column="institution_region_street" property="institutionRegionStreet"/> <result column="institution_region_street" property="institutionRegionStreet"/>
<result column="institution_type" property="institutionType"/>
<result column="creator" property="creator"/> <result column="creator" property="creator"/>
<result column="gmt_create" property="gmtCreate"/> <result column="gmt_create" property="gmtCreate"/>
<result column="modifier" property="modifier"/> <result column="modifier" property="modifier"/>
@ -45,7 +47,7 @@
<result column="is_delete" property="isDelete"/> <result column="is_delete" property="isDelete"/>
</resultMap> </resultMap>
<resultMap id="institutionPO" type="cn.com.tenlion.pojo.pos.institution.InstitutionPO"> <resultMap id="institutionPO" type="cn.com.tenlion.institutionmanagement.pojo.pos.institution.InstitutionPO">
<result column="institution_id" property="institutionId"/> <result column="institution_id" property="institutionId"/>
<result column="institution_name" property="institutionName"/> <result column="institution_name" property="institutionName"/>
<result column="institution_desc" property="institutionDesc"/> <result column="institution_desc" property="institutionDesc"/>
@ -61,6 +63,7 @@
<result column="institution_region_area" property="institutionRegionArea"/> <result column="institution_region_area" property="institutionRegionArea"/>
<result column="institution_region_village" property="institutionRegionVillage"/> <result column="institution_region_village" property="institutionRegionVillage"/>
<result column="institution_region_street" property="institutionRegionStreet"/> <result column="institution_region_street" property="institutionRegionStreet"/>
<result column="institution_type" property="institutionType"/>
<result column="creator" property="creator"/> <result column="creator" property="creator"/>
<result column="gmt_create" property="gmtCreate"/> <result column="gmt_create" property="gmtCreate"/>
<result column="modifier" property="modifier"/> <result column="modifier" property="modifier"/>
@ -70,7 +73,7 @@
<!-- 新增机构管理 --> <!-- 新增机构管理 -->
<insert id="save" parameterType="map"> <insert id="save" parameterType="map">
INSERT INTO institution( INSERT INTO m_institution(
institution_id, institution_id,
institution_name, institution_name,
institution_desc, institution_desc,
@ -86,6 +89,7 @@
institution_region_area, institution_region_area,
institution_region_village, institution_region_village,
institution_region_street, institution_region_street,
institution_type,
creator, creator,
gmt_create, gmt_create,
modifier, modifier,
@ -107,6 +111,7 @@
#{institutionRegionArea}, #{institutionRegionArea},
#{institutionRegionVillage}, #{institutionRegionVillage},
#{institutionRegionStreet}, #{institutionRegionStreet},
#{institutionType},
#{creator}, #{creator},
#{gmtCreate}, #{gmtCreate},
#{modifier}, #{modifier},
@ -118,7 +123,7 @@
<!-- 删除机构管理 --> <!-- 删除机构管理 -->
<update id="remove" parameterType="map"> <update id="remove" parameterType="map">
UPDATE UPDATE
institution m_institution
SET SET
gmt_modified = #{gmtModified}, gmt_modified = #{gmtModified},
modifier = #{modifier}, modifier = #{modifier},
@ -133,7 +138,7 @@
<!-- 删除机构管理（物理） --> <!-- 删除机构管理（物理） -->
<update id="delete" parameterType="map"> <update id="delete" parameterType="map">
DELETE FROM DELETE FROM
institution m_institution
WHERE WHERE
institution_id IN institution_id IN
<foreach collection="institutionIds" index="index" open="(" separator="," close=")"> <foreach collection="institutionIds" index="index" open="(" separator="," close=")">
@ -144,53 +149,29 @@
<!-- 修改机构管理 --> <!-- 修改机构管理 -->
<update id="update" parameterType="map"> <update id="update" parameterType="map">
UPDATE UPDATE
institution m_institution
SET SET
<if test="institutionName != null and institutionName != ''"> <if test="institutionName != null and institutionName != ''">
institution_name = #{institutionName}, institution_name = #{institutionName},
</if> </if>
<if test="institutionDesc != null and institutionDesc != ''"> <if test="institutionType != null and institutionType != ''">
institution_type = #{institutionType},
</if>
institution_desc = #{institutionDesc}, institution_desc = #{institutionDesc},
</if>
<if test="institutionImage != null and institutionImage != ''">
institution_image = #{institutionImage}, institution_image = #{institutionImage},
</if>
<if test="institutionAddress != null and institutionAddress != ''">
institution_address = #{institutionAddress}, institution_address = #{institutionAddress},
</if>
<if test="institutionX != null and institutionX != ''">
institution_x = #{institutionX}, institution_x = #{institutionX},
</if>
<if test="institutionY != null and institutionY != ''">
institution_y = #{institutionY}, institution_y = #{institutionY},
</if>
<if test="institutionFoundingTime != null and institutionFoundingTime != ''">
institution_founding_time = #{institutionFoundingTime}, institution_founding_time = #{institutionFoundingTime},
</if>
<if test="institutionPrincipal != null and institutionPrincipal != ''">
institution_principal = #{institutionPrincipal}, institution_principal = #{institutionPrincipal},
</if>
<if test="institutionContact != null and institutionContact != ''">
institution_contact = #{institutionContact}, institution_contact = #{institutionContact},
</if>
<if test="institutionRegionProvince != null and institutionRegionProvince != ''">
institution_region_province = #{institutionRegionProvince}, institution_region_province = #{institutionRegionProvince},
</if>
<if test="institutionRegionCity != null and institutionRegionCity != ''">
institution_region_city = #{institutionRegionCity}, institution_region_city = #{institutionRegionCity},
</if>
<if test="institutionRegionArea != null and institutionRegionArea != ''">
institution_region_area = #{institutionRegionArea}, institution_region_area = #{institutionRegionArea},
</if>
<if test="institutionRegionVillage != null and institutionRegionVillage != ''">
institution_region_village = #{institutionRegionVillage}, institution_region_village = #{institutionRegionVillage},
</if>
<if test="institutionRegionStreet != null and institutionRegionStreet != ''">
institution_region_street = #{institutionRegionStreet}, institution_region_street = #{institutionRegionStreet},
</if>
gmt_modified = #{gmtModified}, gmt_modified = #{gmtModified},
modifier = #{modifier}, modifier = #{modifier}
institution_id = institution_id
WHERE WHERE
institution_id = #{institutionId} institution_id = #{institutionId}
</update> </update>
@ -212,9 +193,10 @@
t1.institution_region_area, t1.institution_region_area,
t1.institution_region_village, t1.institution_region_village,
t1.institution_region_street, t1.institution_region_street,
t1.institution_type,
t1.institution_id t1.institution_id
FROM FROM
institution t1 m_institution t1
WHERE WHERE
t1.is_delete = 0 t1.is_delete = 0
<if test="institutionId != null and institutionId != ''"> <if test="institutionId != null and institutionId != ''">
@ -241,13 +223,14 @@
t1.institution_region_area, t1.institution_region_area,
t1.institution_region_village, t1.institution_region_village,
t1.institution_region_street, t1.institution_region_street,
t1.institution_type,
t1.creator, t1.creator,
t1.gmt_create, t1.gmt_create,
t1.modifier, t1.modifier,
t1.gmt_modified, t1.gmt_modified,
t1.is_delete t1.is_delete
FROM FROM
institution t1 m_institution t1
WHERE WHERE
t1.is_delete = 0 t1.is_delete = 0
<if test="institutionId != null and institutionId != ''"> <if test="institutionId != null and institutionId != ''">
@ -274,13 +257,14 @@
t1.institution_region_area, t1.institution_region_area,
t1.institution_region_village, t1.institution_region_village,
t1.institution_region_street, t1.institution_region_street,
t1.institution_type,
t1.creator, t1.creator,
t1.gmt_create, t1.gmt_create,
t1.modifier, t1.modifier,
t1.gmt_modified, t1.gmt_modified,
t1.is_delete t1.is_delete
FROM FROM
institution t1 m_institution t1
WHERE WHERE
t1.is_delete = 0 t1.is_delete = 0
<if test="institutionId != null and institutionId != ''"> <if test="institutionId != null and institutionId != ''">
@ -307,17 +291,17 @@
t1.institution_region_area, t1.institution_region_area,
t1.institution_region_village, t1.institution_region_village,
t1.institution_region_street, t1.institution_region_street,
t1.institution_type,
t1.creator, t1.creator,
t1.gmt_create, t1.gmt_create
1
FROM FROM
institution t1 m_institution t1
WHERE WHERE
t1.is_delete = 0 t1.is_delete = 0
<if test="keywords != null and keywords != ''"> <if test="keywords != null and keywords != ''">
AND ( AND (
<!-- 这里添加其他条件 --> <!-- 这里添加其他条件 -->
t1.id LIKE CONCAT('%', #{keywords}, '%') t1.institution_name LIKE CONCAT('%', #{keywords}, '%')
) )
</if> </if>
<if test="startTime != null and startTime != ''"> <if test="startTime != null and startTime != ''">
@ -335,6 +319,11 @@
#{institutionIds[${index}]} #{institutionIds[${index}]}
</foreach> </foreach>
</if> </if>
<if test="institutionType != null and institutionType != ''">
AND
t1.institution_type = #{institutionType}
</if>
ORDER BY t1.gmt_create DESC
</select> </select>
<!-- 机构管理列表 --> <!-- 机构管理列表 -->
@ -355,19 +344,20 @@
t1.institution_region_area, t1.institution_region_area,
t1.institution_region_village, t1.institution_region_village,
t1.institution_region_street, t1.institution_region_street,
t1.institution_type,
t1.creator, t1.creator,
t1.gmt_create, t1.gmt_create,
t1.modifier, t1.modifier,
t1.gmt_modified, t1.gmt_modified,
t1.is_delete t1.is_delete
FROM FROM
institution t1 m_institution t1
WHERE WHERE
t1.is_delete = 0 t1.is_delete = 0
<if test="keywords != null and keywords != ''"> <if test="keywords != null and keywords != ''">
AND ( AND (
<!-- 这里添加其他条件 --> <!-- 这里添加其他条件 -->
t1.id LIKE CONCAT('%', #{keywords}, '%') t1.institution_name LIKE CONCAT('%', #{keywords}, '%')
) )
</if> </if>
<if test="startTime != null and startTime != ''"> <if test="startTime != null and startTime != ''">
@ -385,6 +375,11 @@
#{institutionIds[${index}]} #{institutionIds[${index}]}
</foreach> </foreach>
</if> </if>
<if test="institutionType != null and institutionType != ''">
AND
t1.institution_type = #{institutionType}
</if>
ORDER BY t1.gmt_create DESC
</select> </select>
<!-- 机构管理列表 --> <!-- 机构管理列表 -->
@ -411,13 +406,13 @@
t1.gmt_modified, t1.gmt_modified,
t1.is_delete t1.is_delete
FROM FROM
institution t1 m_institution t1
WHERE WHERE
t1.is_delete = 0 t1.is_delete = 0
<if test="keywords != null and keywords != ''"> <if test="keywords != null and keywords != ''">
AND ( AND (
<!-- 这里添加其他条件 --> <!-- 这里添加其他条件 -->
t1.id LIKE CONCAT('%', #{keywords}, '%') t1.institution_name LIKE CONCAT('%', #{keywords}, '%')
) )
</if> </if>
<if test="startTime != null and startTime != ''"> <if test="startTime != null and startTime != ''">
@ -435,6 +430,11 @@
#{institutionIds[${index}]} #{institutionIds[${index}]}
</foreach> </foreach>
</if> </if>
<if test="institutionType != null and institutionType != ''">
AND
t1.institution_type = #{institutionType}
</if>
ORDER BY t1.gmt_create DESC
</select> </select>
<!-- 机构管理统计 --> <!-- 机构管理统计 -->
@ -442,7 +442,7 @@
SELECT SELECT
COUNT(*) COUNT(*)
FROM FROM
institution t1 m_institution t1
WHERE WHERE
t1.is_delete = 0 t1.is_delete = 0
</select> </select>

275
module-institution-management/src/main/resources/templates/baidumap/map-baidu.html Normal file
View File

@ -0,0 +1,275 @@
<!doctype html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<base th:href="${#request.getContextPath() + '/'}">
<meta charset="utf-8">
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
<link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
<link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
<script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&ak=2qzNKd33lQERUDakqDDyvLOyqM1x2i8y"></script>
</head>
<body>
<div class="layui-anim layui-anim-fadein">
<div class="layui-card">
<div class="layui-inline">
<input type="text" class="layui-input search-item" name="searchMapId" id="searchMapId" value="">
</div>
<button type="button" class="layui-btn layui-btn-normal layui-btn-sm" id = "searchMap">
<i class="fa fa-lg fa-search"></i>
</button>
<input type="hidden" id="mapX" value=""><!--经度-->
<input type="hidden" id="mapY" value=""><!--纬度-->
<input type="hidden" id="mapName" value=""><!--名称-->
<div id="maplocation" style="width:100%;height:500px;"></div>
<div class="layui-form-item layui-layout-admin">
<div class="layui-input-block">
<div class="layui-footer" style="left: 0;">
<button type="button" class="layui-btn" id = "save">保存</button>
</div>
</div>
</div>
</div>
</div>
<script src="assets/js/vendor/wangEditor/wangEditor.min.js"></script>
<script src="assets/js/vendor/ckplayer/ckplayer/ckplayer.js"></script>
<script src="assets/js/jquery-2.1.1.min.js"></script>
<script src="assets/layuiadmin/layui/layui.js"></script>
<script src="assets/js/vendor/viewer/viewer.min.js"></script>
<script>
layui.config({
base: 'assets/layuiadmin/'
}).extend({
index: 'lib/index'
}).use(['index', 'table', 'laydate', 'common'], function() {
var $ = layui.$;
var $win = $(window);
var table = layui.table;
var admin = layui.admin;
var common = layui.common;
var mapObj = {}
initMap(88.886487,29.276981);
var zoomNum = 17;
$("#save").on('click',function(){
var mapX = $("#mapX").val();
var mapY = $("#mapY").val();
if ("经度：空" == mapX || "纬度：空" == mapY) {
layer.msg("尚未选择位置");
} else {
top.dialog.dialogData.activityAddressX = mapX;
top.dialog.dialogData.activityAddressY = mapY;
top.dialog.dialogData.activityAddress = $("#mapName").val();
closeWindow();
}
});
function ComplexCustomOverlay(point, text) { // 构造函数
this._point = point;
this._text = text;
}
ComplexCustomOverlay.prototype = new BMap.Overlay();
// 监听事件 通过构造函数的prototype属性 添加任自定义的方法
ComplexCustomOverlay.prototype.addEventListener = function (event, fun) {
this._div['on' + event] = fun;
}
ComplexCustomOverlay.prototype.initialize = function (map) {
this._map = map;
var A = this._div = document.createElement("a");
A.style.display = "block";
A.style.position = "absolute";
A.style.zIndex = BMap.Overlay.getZIndex(this._point.lat);
A.style.border = "1px solid #ff6000";
A.style.color = "#FF0000";
A.style.display = "block";
A.style.fontWeight = "bold";
A.style.height = "20px";
A.style.padding = "0px 4px 0px 0px";
A.style.lineHeight = "15px";
A.style.whiteSpace = "nowrap";
A.style.MozUserSelect = "none";
A.style.fontSize = "13px"
var span = this._span = document.createElement("span");
var img = document.createElement("img");
img.src = "<%=basePath%>static/images/department.png";
img.style.height = "18px";
img.style.width = "20px";
A.appendChild(img);
A.appendChild(span);
span.appendChild(document.createTextNode(this._text));
var that = this;
var arrow = this._arrow = document.createElement("div");
arrow.style.background = "url(<%=basePath%>static/images/member.png) -77px -119px no-repeat";
arrow.style.position = "absolute";
arrow.style.width = "21px";
arrow.style.height = "32px";
arrow.style.top = "-1px";
arrow.style.left = "-11px";//-11
arrow.style.overflow = "hidden";
A.appendChild(arrow);
A.onmouseover = function () {
this.style.borderColor = "#32CD32";
this.style.color = "#32CD32";
arrow.style.backgroundPosition = "-77px -161px";
this.style.cursor = "pointer";
this.style.zIndex = 100;
}
A.onmouseout = function () {
this.style.borderColor = "#ff6000";
this.style.color = "#ff6000";
arrow.style.backgroundPosition = "-77px -119px";
this.style.zIndex = 1;
}
map.getPanes().labelPane.appendChild(A);
return A;
}
// 实现绘制方法
ComplexCustomOverlay.prototype.draw = function () {
var map = this._map;
var pixel = map.pointToOverlayPixel(this._point);
this._div.style.left = pixel.x + "px";
this._div.style.top = pixel.y + "px";
}
function closeWindow() {
var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
parent.layer.close(index);
}
// 查询地名对象
var geoc = new BMap.Geocoder();
//创建和初始化地图函数：
function initMap(x, y) {
createMap(x, y);//创建地图
setMapEvent();//设置地图事件
addMapControl();//向地图添加控件
}
//创建地图函数：
function createMap(x, y) {
var map = new BMap.Map("maplocation");//在百度地图容器中创建一个地图
var point = new BMap.Point(x, y);//定义一个中心点坐标
map.addOverlay(new BMap.Marker(point));//定点坐标红点覆盖
/*map.centerAndZoom(point, zoomNum);//设定地图的中心点和坐标并将地图显示在地图容器中*/
map.centerAndZoom(point, 12)
window.map = map;//将map变量存储在全局
}
//地图事件设置函数：
function setMapEvent() {
map.enableDragging();//启用地图拖拽事件，默认启用(可不写)
map.enableScrollWheelZoom();//启用地图滚轮放大缩小
map.enableContinuousZoom();//开启缩放平滑
map.enableDoubleClickZoom();//启用鼠标双击放大，默认启用(可不写)
map.enableKeyboard();//启用键盘上下左右键移动地图
map.addEventListener("click", function (e) {
var LONGITUDE = e.point.lng;
var LATITUDE = e.point.lat;
/*$("#LONGITUDE").text("经度："+LONGITUDE);
$("#LATITUDE").text("纬度："+LATITUDE);*/
geoc.getLocation(e.point, function (rs) {
var addComp = rs.addressComponents;
var site = addComp.province + "." + addComp.city + "." + addComp.district;
if (addComp.street) {
site = site + "." + addComp.street;
}
if (addComp.streetNumber) {
site = site + "." + addComp.streetNumber;
}
/*$("#MAP_NAME").text(site);*/
$('#mapX').val(LONGITUDE);
$('#mapY').val(LATITUDE);
$('#mapName').val(site);
/* console.log("经度"+LONGITUDE)
console.log("纬度"+LATITUDE)
console.log("名称"+site)*/
});
// 如果不循环删除遮罩会一直累加
var allOverlay = map.getOverlays();
for (var i = 0; i < allOverlay.length; i++) {
map.removeOverlay(allOverlay[i]);
}
// 第一种"显示太大
// var point = new BMap.Point(LONGITUDE, LATITUDE);
// var myCompOverlay = new ComplexCustomOverlay(point, "经度："+LONGITUDE + "|纬度："+LATITUDE);
// map.addOverlay(myCompOverlay);
// 第二中"系统默认
var point = new BMap.Point(LONGITUDE, LATITUDE);//定义一个中心点坐标
map.addOverlay(new BMap.Marker(point));//定点坐标红点覆盖
// 重新初始化
// initMap(LONGITUDE, LATITUDE);
});
map.addEventListener("zoomend", function (e) {
zoomNum = map.getZoom();
});
}
// 地图控件添加函数：
function addMapControl() {
// 向地图中添加缩放控件
var ctrl_nav = new BMap.NavigationControl({
anchor: BMAP_ANCHOR_TOP_LEFT,
type: BMAP_NAVIGATION_CONTROL_LARGE
});
map.addControl(ctrl_nav);
// 向地图中添加缩略图控件
var ctrl_ove = new BMap.OverviewMapControl({
anchor: BMAP_ANCHOR_BOTTOM_RIGHT,
isOpen: 2
});
map.addControl(ctrl_ove);
// 向地图中添加比例尺控件
var ctrl_sca = new BMap.ScaleControl({
anchor: BMAP_ANCHOR_BOTTOM_LEFT
});
map.addControl(ctrl_sca);
}
$("#searchMap").on('click',function(){
var searchInput = $('#searchMapId').val();
if (!searchInput) {
layer.msg("查询内容不能为空");
}
var localSearch = new BMap.LocalSearch(map);
localSearch.setSearchCompleteCallback(function (msg) {
if (localSearch.getStatus() == BMAP_STATUS_SUCCESS) {
var poi = msg.getPoi(0);
if (poi) {
initMap(poi.point.lng, poi.point.lat);
var LONGITUDE = poi.point.lng;
var LATITUDE = poi.point.lat;
$("#mapX").val(LONGITUDE);
$("#mapY").val(LATITUDE);
$("#mapName").val((poi.province ? poi.province + "." : "") + (poi.address ? poi.address + "." : poi.city + ".") + poi.title);
console.log(poi);
$("#MAP_NAME").text((poi.province ? poi.province + "." : "") + (poi.address ? poi.address + "." : poi.city + ".") + poi.title);
}
} else {
layer.msg("没有查询结果");
}
});
localSearch.search(searchInput);
});
});
</script>
</body>
</html>

88
module-institution-management/src/main/resources/mybatis/templates/institution/list.html → module-institution-management/src/main/resources/templates/institution/list.html
View File

@ -9,6 +9,7 @@
<link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/> <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
<link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all"> <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all"> <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
<link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
</head> </head>
<body> <body>
<div class="layui-fluid layui-anim layui-anim-fadein"> <div class="layui-fluid layui-anim layui-anim-fadein">
@ -86,42 +87,27 @@
[ [
{type:'checkbox', fixed: 'left'}, {type:'checkbox', fixed: 'left'},
{field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'}, {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
{field: 'institutionName', width: 180, 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;
}
},
{field: 'institutionImage', width: 180, title: '机构图片', align:'center', {field: 'institutionImage', width: 180, title: '机构图片', align:'center',
templet: function(row) { templet: function(row) {
var rowData = row[this.field]; var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-'; return '-';
} }
var downloadFile = ''; var value='<ul id="viewer">';
var datas = rowData.split(','); var datas = rowData.split(',');
for(var i = 0, item = datas[i]; item = datas[i++];) { for(var i = 0, item = datas[i]; item = datas[i++];) {
if(downloadFile.length > 0) { value += '<li><img style="height: 80px;width: 80px;" src="route/file/download/false/'+ item +'" alt="图片1"></li>';
downloadFile += ' | ';
} }
downloadFile += '<a href="route/file/download/false/'+ item +'" target="_blank">点击下载</a>' value += '</ul>';
} setTimeout(function() {
return downloadFile; new Viewer(document.getElementById("viewer"),{
loop:true
});
}, 50);
return value;
} }
}, },
{field: 'institutionAddress', width: 180, title: '机构详情地址', align:'center', {field: 'institutionName', width: 180, title: '机构名称', align:'center',
templet: function(row) { templet: function(row) {
var rowData = row[this.field]; var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@ -148,7 +134,7 @@
return rowData; return rowData;
} }
}, },
{field: 'institutionContact', width: 180, title: '机构联系方式', align:'center', {field: 'institutionContact', width: 250, title: '机构联系方式', align:'center',
templet: function(row) { templet: function(row) {
var rowData = row[this.field]; var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@ -157,7 +143,7 @@
return rowData; return rowData;
} }
}, },
{field: 'institutionRegionProvince', width: 180, title: '行政区划-省', align:'center', {field: 'institutionAddress', width: 350, title: '机构详情地址', align:'center',
templet: function(row) { templet: function(row) {
var rowData = row[this.field]; var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@ -166,52 +152,7 @@
return rowData; return rowData;
} }
}, },
{field: 'institutionRegionCity', width: 180, title: '行政区化-市', align:'center', {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: 'institutionRegionArea', width: 180, title: '行政区化-区', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
return rowData;
}
},
{field: 'institutionRegionVillage', width: 180, title: '行政区化-村', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
return rowData;
}
},
{field: 'institutionRegionStreet', width: 180, title: '行政区化-街', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
return rowData;
}
},
{field: 'creator', width: 180, title: '', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
return rowData;
}
},
{field: 'gmtCreate', width: 180, title: '', align:'center',
templet: function(row) { templet: function(row) {
var rowData = row[this.field]; var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@ -220,6 +161,7 @@
return rowData; return rowData;
} }
}, },
] ]
], ],
page: true, page: true,

172
module-institution-management/src/main/resources/mybatis/templates/institution/save.html → module-institution-management/src/main/resources/templates/institution/save.html
View File

@ -10,6 +10,20 @@
<link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all"> <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all"> <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
<link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css"> <link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
<style>
.layui-form-label{
width:120px !important;
}
.layui-input-block{
margin-left:120px !important;
}
.layui-form-text .layui-input-block{
margin: 0 !important;
}
.layui-form-text .layui-form-label{
width: 100% !important;
}
</style>
</head> </head>
<body> <body>
<div class="layui-fluid layui-anim layui-anim-fadein"> <div class="layui-fluid layui-anim layui-anim-fadein">
@ -22,18 +36,6 @@
</div> </div>
<div class="layui-card-body" style="padding: 15px;"> <div class="layui-card-body" style="padding: 15px;">
<form class="layui-form layui-form-pane" lay-filter="dataForm"> <form class="layui-form layui-form-pane" lay-filter="dataForm">
<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">
</div>
</div>
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">机构描述</label>
<div class="layui-input-block">
<textarea id="institutionDesc" name="institutionDesc" class="layui-textarea" placeholder="请输入机构描述"></textarea>
</div>
</div>
<div class="layui-form-item layui-form-text"> <div class="layui-form-item layui-form-text">
<label class="layui-form-label">机构图片</label> <label class="layui-form-label">机构图片</label>
<div class="layui-input-block"> <div class="layui-input-block">
@ -64,22 +66,10 @@
</script> </script>
</div> </div>
</div> </div>
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">机构详情地址</label>
<div class="layui-input-block">
<textarea id="institutionAddress" name="institutionAddress" class="layui-textarea" placeholder="请输入机构详情地址"></textarea>
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">机构经度</label> <label class="layui-form-label">机构名称</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="institutionX" name="institutionX" class="layui-input" value="" placeholder="请输入机构经度" maxlength="50"> <input type="text" id="institutionName" name="institutionName" 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="text" id="institutionY" name="institutionY" class="layui-input" value="" placeholder="请输入机构纬度" maxlength="50">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
@ -88,6 +78,12 @@
<input type="text" id="institutionFoundingTime" name="institutionFoundingTime" class="layui-input" value="" placeholder="请选择机构成立时间" readonly style="cursor: pointer;" lay-verify="required"> <input type="text" id="institutionFoundingTime" name="institutionFoundingTime" class="layui-input" value="" placeholder="请选择机构成立时间" readonly style="cursor: pointer;" lay-verify="required">
</div> </div>
</div> </div>
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">机构描述</label>
<div class="layui-input-block">
<textarea id="institutionDesc" name="institutionDesc" class="layui-textarea" placeholder="请输入机构描述"></textarea>
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">机构负责人</label> <label class="layui-form-label">机构负责人</label>
<div class="layui-input-block"> <div class="layui-input-block">
@ -101,33 +97,46 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">行政区划-省</label> <label class="layui-form-label">行政区划</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<select name="institutionRegionProvince" id="institutionRegionProvince" placeholder="请选择省" lay-verify=""> <select name="institutionRegionProvince" id="institutionRegionProvince" lay-filter="institutionRegionProvince">
<option value="">请选择省</option> <option value="">请选择省</option>
</select> </select>
</div> </div>
<div class="layui-input-inline"> <div class="layui-input-inline">
<select name="institutionRegionCity" id="institutionRegionCity" placeholder="请选择市" lay-verify=""> <select name="institutionRegionCity" id="institutionRegionCity" lay-filter="institutionRegionCity">
<option value="">请选择市</option> <option value="">请选择市</option>
</select> </select>
</div> </div>
<div class="layui-input-inline"> <div class="layui-input-inline">
<select name="institutionRegionArea" id="institutionRegionArea" placeholder="请选择区" lay-verify=""> <select name="institutionRegionArea" id="institutionRegionArea" lay-filter="institutionRegionArea">
<option value="">请选择区</option> <option value="">请选择县</option>
</select> </select>
</div> </div>
<div class="layui-input-inline"> <div class="layui-input-inline">
<select name="institutionRegionVillage" id="institutionRegionVillage" placeholder="请选择镇" lay-verify=""> <select name="institutionRegionVillage" id="institutionRegionVillage" lay-filter="institutionRegionVillage">
<option value="">请选择镇/村</option> <option value="">请选择镇</option>
</select> </select>
</div> </div>
<div class="layui-input-inline"> <div class="layui-input-inline">
<select name="institutionRegionStreet" id="institutionRegionStreet" placeholder="请选择街" lay-verify=""> <select name="institutionRegionStreet" id="institutionRegionStreet" lay-filter="institutionRegionStreet">
<option value="">请选择街</option> <option value="">请选择村</option>
</select> </select>
</div> </div>
</div> </div>
<div class="layui-form-item">
<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="请输入机构纬度">
<input type="text" id="institutionAddress" name="institutionAddress" class="layui-input" value="" placeholder="请输入机构地址" maxlength="50">
</div>
</div>
<div class="layui-row">
<div class="layui-col-md12 layui-col-sm12" style="padding: 0 0px;">
<div id="mapContainer" style="width: 100%;height: 350px;"></div>
</div>
</div>
<div class="layui-form-item layui-layout-admin"> <div class="layui-form-item layui-layout-admin">
<div class="layui-input-block"> <div class="layui-input-block">
<div class="layui-footer" style="left: 0;"> <div class="layui-footer" style="left: 0;">
@ -140,6 +149,7 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=3.0&ak=oWU9RD4ihDHAafexgI6XOrTK8lDatRju"></script>
<script src="assets/js/vendor/wangEditor/wangEditor.min.js"></script> <script src="assets/js/vendor/wangEditor/wangEditor.min.js"></script>
<script src="assets/js/vendor/ckplayer/ckplayer/ckplayer.js"></script> <script src="assets/js/vendor/ckplayer/ckplayer/ckplayer.js"></script>
<script src="assets/js/vendor/viewer/viewer.min.js"></script> <script src="assets/js/vendor/viewer/viewer.min.js"></script>
@ -157,6 +167,7 @@
var wangEditor = window.wangEditor; var wangEditor = window.wangEditor;
var wangEditorObj = {}; var wangEditorObj = {};
var viewerObj = {}; var viewerObj = {};
var dictId = '0';
function closeBox() { function closeBox() {
parent.layer.close(parent.layer.getFrameIndex(window.name)); parent.layer.close(parent.layer.getFrameIndex(window.name));
@ -184,7 +195,6 @@
} }
return; return;
} }
top.restAjax.get(top.restAjax.path('api/file/list', []), { top.restAjax.get(top.restAjax.path('api/file/list', []), {
ids: ids ids: ids
}, null, function(code, data) { }, null, function(code, data) {
@ -268,8 +278,7 @@
function initInstitutionFoundingTimeDateTime() { function initInstitutionFoundingTimeDateTime() {
laydate.render({ laydate.render({
elem: '#institutionFoundingTime', elem: '#institutionFoundingTime',
type: 'datetime', type: 'date',
value: new Date(),
trigger: 'click' trigger: 'click'
}); });
} }
@ -279,6 +288,8 @@
function initData() { function initData() {
initInstitutionImageUploadFile(); initInstitutionImageUploadFile();
initInstitutionFoundingTimeDateTime(); initInstitutionFoundingTimeDateTime();
initMap('109.85017859252311', '40.66017700460503');
initDataDict(dictId,'institutionRegionProvince');
} }
initData(); initData();
@ -315,6 +326,91 @@
closeBox(); closeBox();
}); });
//初始化百度地图
function initMap(longitude, latitude) {
map = new BMap.Map("mapContainer", {enableMapClick: false,});
var point = new BMap.Point(longitude, latitude);
map.centerAndZoom(point, 13);
map.disableDoubleClickZoom();
map.addControl(new BMap.NavigationControl());
map.addControl(new BMap.ScaleControl());
map.addControl(new BMap.OverviewMapControl());
map.addControl(new BMap.MapTypeControl());
map.enableScrollWheelZoom();//启用地图滚轮放大缩小
map.enableContinuousZoom();//开启缩放平滑
// 点击获取地址
var geocoder= new BMap.Geocoder();
mapMarkPoint(map, point);
map.addEventListener("click", function(e) {
map.clearOverlays();
$('#institutionX').val(e.point.lng);
$('#institutionY').val(e.point.lat);
point = new BMap.Point(e.point.lng, e.point.lat);
mapMarkPoint(map, point);
geocoder.getLocation(e.point, function(rs) {
$('#institutionAddress').val(rs.address);
});
});
}
//地图标点
function mapMarkPoint(map, point) {
var marker = new BMap.Marker(point);
map.addOverlay(marker);
}
//c初始化数据字典
function initDataDict(dictId,tabId){
if(!dictId){
return;
}
top.restAjax.get(top.restAjax.path("api/area/listbyparentid/{areaParentId}",[dictId]),{},null,function (code,data,args) {
$("#"+tabId).empty();
var html = '';
if ('institutionRegionProvince' === tabId){
html += '<option value="">请选择省</option>';
}
if ('institutionRegionCity' === tabId){
html += '<option value="">请选择市</option>';
}
if ('institutionRegionArea' === tabId){
html += '<option value="">请选择县</option>';
}
if ('institutionRegionVillage' === tabId){
html += '<option value="">请选择镇</option>';
}
if ('institutionRegionStreet' === tabId){
html += '<option value="">请选择村</option>';
}
$.each(data, function (index, item) {
html += '<option value="'+item.areaId+'">'+item.areaName+'</option>';
});
$("#"+tabId).append(html);
form.render('select');
});
}
//省监听事件
form.on('select(institutionRegionProvince)', function(data){
var v = data.value;
initDataDict(v,'institutionRegionCity');
});
//市监听事件
form.on('select(institutionRegionCity)', function(data){
var v = data.value;
initDataDict(v,'institutionRegionArea');
});
//区监听事件
form.on('select(institutionRegionArea)', function(data){
var v = data.value;
initDataDict(v,'institutionRegionVillage');
});
//镇、村监听事件
form.on('select(institutionRegionVillage)', function(data){
var v = data.value;
initDataDict(v,'institutionRegionStreet');
});
// 校验 // 校验
form.verify({ form.verify({
}); });

216
module-institution-management/src/main/resources/mybatis/templates/institution/update.html → module-institution-management/src/main/resources/templates/institution/update.html
View File

@ -10,6 +10,20 @@
<link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all"> <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all"> <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
<link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css"> <link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
<style>
.layui-form-label{
width:120px !important;
}
.layui-input-block{
margin-left:120px !important;
}
.layui-form-text .layui-input-block{
margin: 0 !important;
}
.layui-form-text .layui-form-label{
width: 100% !important;
}
</style>
</head> </head>
<body> <body>
<div class="layui-fluid layui-anim layui-anim-fadein"> <div class="layui-fluid layui-anim layui-anim-fadein">
@ -22,18 +36,6 @@
</div> </div>
<div class="layui-card-body" style="padding: 15px;"> <div class="layui-card-body" style="padding: 15px;">
<form class="layui-form layui-form-pane" lay-filter="dataForm"> <form class="layui-form layui-form-pane" lay-filter="dataForm">
<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">
</div>
</div>
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">机构描述</label>
<div class="layui-input-block">
<textarea id="institutionDesc" name="institutionDesc" class="layui-textarea" placeholder="请输入机构描述"></textarea>
</div>
</div>
<div class="layui-form-item layui-form-text"> <div class="layui-form-item layui-form-text">
<label class="layui-form-label">机构图片</label> <label class="layui-form-label">机构图片</label>
<div class="layui-input-block"> <div class="layui-input-block">
@ -64,28 +66,22 @@
</script> </script>
</div> </div>
</div> </div>
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">机构详情地址</label>
<div class="layui-input-block">
<textarea id="institutionAddress" name="institutionAddress" class="layui-textarea" placeholder="请输入机构详情地址"></textarea>
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">机构经度</label> <label class="layui-form-label">机构名称</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="institutionX" name="institutionX" class="layui-input" value="" placeholder="请输入机构经度" maxlength="50"> <input type="text" id="institutionName" name="institutionName" 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="text" id="institutionY" name="institutionY" class="layui-input" value="" placeholder="请输入机构纬度" maxlength="50">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">机构成立时间</label> <label class="layui-form-label">机构成立时间</label>
<div class="layui-input-block"> <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 layui-form-text">
<label class="layui-form-label">机构描述</label>
<div class="layui-input-block">
<textarea id="institutionDesc" name="institutionDesc" class="layui-textarea" placeholder="请输入机构描述"></textarea>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
@ -101,33 +97,44 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">行政区划-省</label> <label class="layui-form-label">行政区划</label>
<div class="layui-input-block"> <div class="layui-input-inline">
<input type="text" id="institutionRegionProvince" name="institutionRegionProvince" class="layui-input" value="" placeholder="请输入行政区划-省" maxlength="255"> <select name="institutionRegionProvince" id="institutionRegionProvince" lay-filter="institutionRegionProvince">
<option value="">请选择省</option>
</select>
</div>
<div class="layui-input-inline">
<select name="institutionRegionCity" id="institutionRegionCity" lay-filter="institutionRegionCity">
<option value="">请选择市</option>
</select>
</div>
<div class="layui-input-inline">
<select name="institutionRegionArea" id="institutionRegionArea" lay-filter="institutionRegionArea">
<option value="">请选择县</option>
</select>
</div>
<div class="layui-input-inline">
<select name="institutionRegionVillage" id="institutionRegionVillage" lay-filter="institutionRegionVillage">
<option value="">请选择镇</option>
</select>
</div>
<div class="layui-input-inline">
<select name="institutionRegionStreet" id="institutionRegionStreet" lay-filter="institutionRegionStreet">
<option value="">请选择村</option>
</select>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">行政区化-市</label> <label class="layui-form-label">机构详细地址</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="institutionRegionCity" name="institutionRegionCity" class="layui-input" value="" placeholder="请输入行政区化-市" maxlength="255"> <input type="hidden" id="institutionX" name="institutionX" value="" placeholder="请输入机构经度">
<input type="hidden" id="institutionY" name="institutionY" value="" placeholder="请输入机构纬度">
<input type="text" id="institutionAddress" name="institutionAddress" class="layui-input" value="" placeholder="请输入机构地址" maxlength="50">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-row">
<label class="layui-form-label">行政区化-区</label> <div class="layui-col-md12 layui-col-sm12" style="padding: 0 0px;">
<div class="layui-input-block"> <div id="mapContainer" style="width: 100%;height: 350px;"></div>
<input type="text" id="institutionRegionArea" name="institutionRegionArea" class="layui-input" value="" placeholder="请输入行政区化-区" maxlength="255">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">行政区化-村</label>
<div class="layui-input-block">
<input type="text" id="institutionRegionVillage" name="institutionRegionVillage" class="layui-input" value="" placeholder="请输入行政区化-村" maxlength="255">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">行政区化-街</label>
<div class="layui-input-block">
<input type="text" id="institutionRegionStreet" name="institutionRegionStreet" class="layui-input" value="" placeholder="请输入行政区化-街" maxlength="255">
</div> </div>
</div> </div>
<div class="layui-form-item layui-layout-admin"> <div class="layui-form-item layui-layout-admin">
@ -142,6 +149,7 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=3.0&ak=oWU9RD4ihDHAafexgI6XOrTK8lDatRju"></script>
<script src="assets/js/vendor/wangEditor/wangEditor.min.js"></script> <script src="assets/js/vendor/wangEditor/wangEditor.min.js"></script>
<script src="assets/js/vendor/ckplayer/ckplayer/ckplayer.js"></script> <script src="assets/js/vendor/ckplayer/ckplayer/ckplayer.js"></script>
<script src="assets/js/vendor/viewer/viewer.min.js"></script> <script src="assets/js/vendor/viewer/viewer.min.js"></script>
@ -157,6 +165,7 @@
var laytpl = layui.laytpl; var laytpl = layui.laytpl;
var laydate = layui.laydate; var laydate = layui.laydate;
var institutionId = top.restAjax.params(window.location.href).institutionId; var institutionId = top.restAjax.params(window.location.href).institutionId;
var dictId = '0';
var wangEditor = window.wangEditor; var wangEditor = window.wangEditor;
var wangEditorObj = {}; var wangEditorObj = {};
@ -269,11 +278,11 @@
} }
// 初始化机构成立时间时间戳 // 初始化机构成立时间时间戳
function initInstitutionFoundingTimeDateTime() { function initInstitutionFoundingTimeDateTime(v) {
laydate.render({ laydate.render({
elem: '#institutionFoundingTime', elem: '#institutionFoundingTime',
type: 'datetime', type: 'date',
value: new Date(), value: v,
trigger: 'click' trigger: 'click'
}); });
} }
@ -290,7 +299,13 @@
form.val('dataForm', dataFormData); form.val('dataForm', dataFormData);
form.render(null, 'dataForm'); form.render(null, 'dataForm');
initInstitutionImageUploadFile(); initInstitutionImageUploadFile();
initInstitutionFoundingTimeDateTime(); initInstitutionFoundingTimeDateTime(data.institutionFoundingTime);
initMap(data.institutionX,data.institutionY);
initDataDict(dictId,'institutionRegionProvince',data.institutionRegionProvince);
initDataDict(data.institutionRegionProvince,'institutionRegionCity',data.institutionRegionCity);
initDataDict(data.institutionRegionCity,'institutionRegionArea',data.institutionRegionArea);
initDataDict(data.institutionRegionArea,'institutionRegionVillage',data.institutionRegionVillage);
initDataDict(data.institutionRegionVillage,'institutionRegionStreet',data.institutionRegionStreet);
}, function(code, data) { }, function(code, data) {
top.dialog.msg(data.msg); top.dialog.msg(data.msg);
}, function() { }, function() {
@ -334,6 +349,103 @@
closeBox(); closeBox();
}); });
//初始化百度地图
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);
map.disableDoubleClickZoom();
map.addControl(new BMap.NavigationControl());
map.addControl(new BMap.ScaleControl());
map.addControl(new BMap.OverviewMapControl());
map.addControl(new BMap.MapTypeControl());
map.enableScrollWheelZoom();//启用地图滚轮放大缩小
map.enableContinuousZoom();//开启缩放平滑
// 点击获取地址
var geocoder= new BMap.Geocoder();
mapMarkPoint(map, point);
map.addEventListener("click", function(e) {
map.clearOverlays();
$('#institutionX').val(e.point.lng);
$('#institutionY').val(e.point.lat);
point = new BMap.Point(e.point.lng, e.point.lat);
mapMarkPoint(map, point);
geocoder.getLocation(e.point, function(rs) {
$('#institutionAddress').val(rs.address);
});
});
}
//地图标点
function mapMarkPoint(map, point) {
var marker = new BMap.Marker(point);
map.addOverlay(marker);
}
//c初始化数据字典
function initDataDict(dictId,tabId,selectVelue){
if(!dictId){
return;
}
top.restAjax.get(top.restAjax.path("api/area/listbyparentid/{areaParentId}",[dictId]),{},null,function (code,data,args) {
$("#"+tabId).empty();
var html = '';
if ('institutionRegionProvince' === tabId){
html += '<option value="">请选择省</option>';
}
if ('institutionRegionCity' === tabId){
html += '<option value="">请选择市</option>';
}
if ('institutionRegionArea' === tabId){
html += '<option value="">请选择县</option>';
}
if ('institutionRegionVillage' === tabId){
html += '<option value="">请选择镇</option>';
}
if ('institutionRegionStreet' === tabId){
html += '<option value="">请选择村</option>';
}
$.each(data, function (index, item) {
if(selectVelue == item.areaId){
html += '<option selected value="'+item.areaId+'">'+item.areaName+'</option>';
}else{
html += '<option value="'+item.areaId+'">'+item.areaName+'</option>';
}
});
$("#"+tabId).append(html);
form.render('select');
});
}
//省监听事件
form.on('select(institutionRegionProvince)', function(data){
var v = data.value;
initDataDict(v,'institutionRegionCity');
});
//市监听事件
form.on('select(institutionRegionCity)', function(data){
var v = data.value;
initDataDict(v,'institutionRegionArea');
});
//区监听事件
form.on('select(institutionRegionArea)', function(data){
var v = data.value;
initDataDict(v,'institutionRegionVillage');
});
//镇、村监听事件
form.on('select(institutionRegionVillage)', function(data){
var v = data.value;
initDataDict(v,'institutionRegionStreet');
});
// 校验 // 校验
form.verify({ form.verify({
}); });

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

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

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

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

0
interface-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/service/organization/IOrganizationService.java → module-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/service/organization/IOrganizationService.java
View File

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

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

48
module-organization-management/src/main/resources/mybatis/mapper/organization/organization-mapper.xml
View File

@ -9,6 +9,7 @@
<result column="organization_principal" property="organizationPrincipal"/> <result column="organization_principal" property="organizationPrincipal"/>
<result column="organization_desc" property="organizationDesc"/> <result column="organization_desc" property="organizationDesc"/>
<result column="organization_image" property="organizationImage"/> <result column="organization_image" property="organizationImage"/>
<result column="organization_type" property="organizationType"/>
<result column="creator" property="creator"/> <result column="creator" property="creator"/>
<result column="gmt_create" property="gmtCreate"/> <result column="gmt_create" property="gmtCreate"/>
</resultMap> </resultMap>
@ -20,6 +21,7 @@
<result column="organization_principal" property="organizationPrincipal"/> <result column="organization_principal" property="organizationPrincipal"/>
<result column="organization_desc" property="organizationDesc"/> <result column="organization_desc" property="organizationDesc"/>
<result column="organization_image" property="organizationImage"/> <result column="organization_image" property="organizationImage"/>
<result column="organization_type" property="organizationType"/>
<result column="creator" property="creator"/> <result column="creator" property="creator"/>
<result column="gmt_create" property="gmtCreate"/> <result column="gmt_create" property="gmtCreate"/>
<result column="modifier" property="modifier"/> <result column="modifier" property="modifier"/>
@ -34,6 +36,7 @@
<result column="organization_principal" property="organizationPrincipal"/> <result column="organization_principal" property="organizationPrincipal"/>
<result column="organization_desc" property="organizationDesc"/> <result column="organization_desc" property="organizationDesc"/>
<result column="organization_image" property="organizationImage"/> <result column="organization_image" property="organizationImage"/>
<result column="organization_type" property="organizationType"/>
<result column="creator" property="creator"/> <result column="creator" property="creator"/>
<result column="gmt_create" property="gmtCreate"/> <result column="gmt_create" property="gmtCreate"/>
<result column="modifier" property="modifier"/> <result column="modifier" property="modifier"/>
@ -43,13 +46,14 @@
<!-- 新增组织管理 --> <!-- 新增组织管理 -->
<insert id="save" parameterType="map"> <insert id="save" parameterType="map">
INSERT INTO organization( INSERT INTO m_organization(
organization_id, organization_id,
organization_name, organization_name,
organization_user_num, organization_user_num,
organization_principal, organization_principal,
organization_desc, organization_desc,
organization_image, organization_image,
organization_type,
creator, creator,
gmt_create, gmt_create,
modifier, modifier,
@ -62,6 +66,7 @@
#{organizationPrincipal}, #{organizationPrincipal},
#{organizationDesc}, #{organizationDesc},
#{organizationImage}, #{organizationImage},
#{organizationType},
#{creator}, #{creator},
#{gmtCreate}, #{gmtCreate},
#{modifier}, #{modifier},
@ -73,7 +78,7 @@
<!-- 删除组织管理 --> <!-- 删除组织管理 -->
<update id="remove" parameterType="map"> <update id="remove" parameterType="map">
UPDATE UPDATE
organization m_organization
SET SET
gmt_modified = #{gmtModified}, gmt_modified = #{gmtModified},
modifier = #{modifier}, modifier = #{modifier},
@ -88,7 +93,7 @@
<!-- 删除组织管理（物理） --> <!-- 删除组织管理（物理） -->
<update id="delete" parameterType="map"> <update id="delete" parameterType="map">
DELETE FROM DELETE FROM
organization m_organization
WHERE WHERE
organization_id IN organization_id IN
<foreach collection="organizationIds" index="index" open="(" separator="," close=")"> <foreach collection="organizationIds" index="index" open="(" separator="," close=")">
@ -99,13 +104,16 @@
<!-- 修改组织管理 --> <!-- 修改组织管理 -->
<update id="update" parameterType="map"> <update id="update" parameterType="map">
UPDATE UPDATE
organization m_organization
SET SET
organization_name = #{organizationName}, organization_name = #{organizationName},
organization_user_num = #{organizationUserNum}, organization_user_num = #{organizationUserNum},
organization_principal = #{organizationPrincipal}, organization_principal = #{organizationPrincipal},
organization_desc = #{organizationDesc}, organization_desc = #{organizationDesc},
organization_image = #{organizationImage}, organization_image = #{organizationImage},
<if test="organizationType != null and organizationType != ''">
organization_type = #{organizationType},
</if>
gmt_modified = #{gmtModified}, gmt_modified = #{gmtModified},
modifier = #{modifier} modifier = #{modifier}
WHERE WHERE
@ -120,9 +128,10 @@
t1.organization_principal, t1.organization_principal,
t1.organization_desc, t1.organization_desc,
t1.organization_image, t1.organization_image,
t1.organization_type,
t1.organization_id t1.organization_id
FROM FROM
organization t1 m_organization t1
WHERE WHERE
t1.is_delete = 0 t1.is_delete = 0
<if test="organizationId != null and organizationId != ''"> <if test="organizationId != null and organizationId != ''">
@ -140,13 +149,14 @@
t1.organization_principal, t1.organization_principal,
t1.organization_desc, t1.organization_desc,
t1.organization_image, t1.organization_image,
t1.organization_type,
t1.creator, t1.creator,
t1.gmt_create, t1.gmt_create,
t1.modifier, t1.modifier,
t1.gmt_modified, t1.gmt_modified,
t1.is_delete t1.is_delete
FROM FROM
organization t1 m_organization t1
WHERE WHERE
t1.is_delete = 0 t1.is_delete = 0
<if test="organizationId != null and organizationId != ''"> <if test="organizationId != null and organizationId != ''">
@ -164,13 +174,14 @@
t1.organization_principal, t1.organization_principal,
t1.organization_desc, t1.organization_desc,
t1.organization_image, t1.organization_image,
t1.organization_type,
t1.creator, t1.creator,
t1.gmt_create, t1.gmt_create,
t1.modifier, t1.modifier,
t1.gmt_modified, t1.gmt_modified,
t1.is_delete t1.is_delete
FROM FROM
organization t1 m_organization t1
WHERE WHERE
t1.is_delete = 0 t1.is_delete = 0
<if test="organizationId != null and organizationId != ''"> <if test="organizationId != null and organizationId != ''">
@ -188,10 +199,11 @@
t1.organization_principal, t1.organization_principal,
t1.organization_desc, t1.organization_desc,
t1.organization_image, t1.organization_image,
t1.organization_type,
t1.creator, t1.creator,
t1.gmt_create t1.gmt_create
FROM FROM
organization t1 m_organization t1
WHERE WHERE
t1.is_delete = 0 t1.is_delete = 0
<if test="keywords != null and keywords != ''"> <if test="keywords != null and keywords != ''">
@ -214,6 +226,10 @@
<foreach collection="organizationIds" index="index" open="(" separator="," close=")"> <foreach collection="organizationIds" index="index" open="(" separator="," close=")">
#{organizationIds[${index}]} #{organizationIds[${index}]}
</foreach> </foreach>
</if>
<if test="organizationType != null and organizationType != ''">
AND
t1.organization_type = #{organizationType}
</if> </if>
ORDER BY t1.gmt_create DESC ORDER BY t1.gmt_create DESC
</select> </select>
@ -227,13 +243,14 @@
t1.organization_principal, t1.organization_principal,
t1.organization_desc, t1.organization_desc,
t1.organization_image, t1.organization_image,
t1.organization_type,
t1.creator, t1.creator,
t1.gmt_create, t1.gmt_create,
t1.modifier, t1.modifier,
t1.gmt_modified, t1.gmt_modified,
t1.is_delete t1.is_delete
FROM FROM
organization t1 m_organization t1
WHERE WHERE
t1.is_delete = 0 t1.is_delete = 0
<if test="keywords != null and keywords != ''"> <if test="keywords != null and keywords != ''">
@ -257,6 +274,10 @@
#{organizationIds[${index}]} #{organizationIds[${index}]}
</foreach> </foreach>
</if> </if>
<if test="organizationType != null and organizationType != ''">
AND
t1.organization_type = #{organizationType}
</if>
ORDER BY t1.gmt_create DESC ORDER BY t1.gmt_create DESC
</select> </select>
@ -269,13 +290,14 @@
t1.organization_principal, t1.organization_principal,
t1.organization_desc, t1.organization_desc,
t1.organization_image, t1.organization_image,
t1.organization_type,
t1.creator, t1.creator,
t1.gmt_create, t1.gmt_create,
t1.modifier, t1.modifier,
t1.gmt_modified, t1.gmt_modified,
t1.is_delete t1.is_delete
FROM FROM
organization t1 m_organization t1
WHERE WHERE
t1.is_delete = 0 t1.is_delete = 0
<if test="keywords != null and keywords != ''"> <if test="keywords != null and keywords != ''">
@ -299,6 +321,10 @@
#{organizationIds[${index}]} #{organizationIds[${index}]}
</foreach> </foreach>
</if> </if>
<if test="organizationType != null and organizationType != ''">
AND
t1.organization_type = #{organizationType}
</if>
ORDER BY t1.gmt_create DESC ORDER BY t1.gmt_create DESC
</select> </select>
@ -307,7 +333,7 @@
SELECT SELECT
COUNT(*) COUNT(*)
FROM FROM
organization t1 m_organization t1
WHERE WHERE
t1.is_delete = 0 t1.is_delete = 0
</select> </select>

57
module-organization-management/src/main/resources/templates/organization/list.html
View File

@ -9,6 +9,7 @@
<link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/> <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
<link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all"> <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all"> <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
<link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
</head> </head>
<body> <body>
<div class="layui-fluid layui-anim layui-anim-fadein"> <div class="layui-fluid layui-anim layui-anim-fadein">
@ -86,6 +87,26 @@
[ [
{type:'checkbox', fixed: 'left'}, {type:'checkbox', fixed: 'left'},
{field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'}, {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
{field: 'organizationImage', width: 180, title: '组织图片', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
var value='<ul id="viewer">';
var datas = rowData.split(',');
for(var i = 0, item = datas[i]; item = datas[i++];) {
value += '<li><img style="height: 80px;width: 80px;" src="route/file/download/false/'+ item +'" alt="图片1"></li>';
}
value += '</ul>';
setTimeout(function() {
new Viewer(document.getElementById("viewer"),{
loop:true
});
}, 50);
return value;
}
},
{field: 'organizationName', width: 180, title: '组织名称', align:'center', {field: 'organizationName', width: 180, title: '组织名称', align:'center',
templet: function(row) { templet: function(row) {
var rowData = row[this.field]; var rowData = row[this.field];
@ -122,41 +143,7 @@
return rowData; return rowData;
} }
}, },
{field: 'organizationImage', width: 180, title: '组织图片', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
var downloadFile = '';
var datas = rowData.split(',');
for(var i = 0, item = datas[i]; item = datas[i++];) {
if(downloadFile.length > 0) {
downloadFile += ' | ';
}
downloadFile += '<a href="route/file/download/false/'+ item +'" target="_blank">点击下载</a>'
}
return downloadFile;
}
},
{field: '创建人', width: 180, title: '', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
return rowData;
}
},
{field: '创建时间', 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, page: true,

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

@ -10,6 +10,20 @@
<link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all"> <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all"> <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
<link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css"> <link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
<style>
.layui-form-label{
width:120px !important;
}
.layui-input-block{
margin-left:120px !important;
}
.layui-form-text .layui-input-block{
margin: 0 !important;
}
.layui-form-text .layui-form-label{
width: 100% !important;
}
</style>
</head> </head>
<body> <body>
<div class="layui-fluid layui-anim layui-anim-fadein"> <div class="layui-fluid layui-anim layui-anim-fadein">
@ -25,13 +39,13 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">组织名称</label> <label class="layui-form-label">组织名称</label>
<div class="layui-input-block"> <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> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">组织人员数量</label> <label class="layui-form-label">组织人员数量</label>
<div class="layui-input-block"> <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> </div>
<div class="layui-form-item"> <div class="layui-form-item">

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

@ -10,6 +10,20 @@
<link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all"> <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all"> <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
<link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css"> <link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
<style>
.layui-form-label{
width:120px !important;
}
.layui-input-block{
margin-left:120px !important;
}
.layui-form-text .layui-input-block{
margin: 0 !important;
}
.layui-form-text .layui-form-label{
width: 100% !important;
}
</style>
</head> </head>
<body> <body>
<div class="layui-fluid layui-anim layui-anim-fadein"> <div class="layui-fluid layui-anim layui-anim-fadein">
@ -25,13 +39,13 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">组织名称</label> <label class="layui-form-label">组织名称</label>
<div class="layui-input-block"> <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> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">组织人员数量</label> <label class="layui-form-label">组织人员数量</label>
<div class="layui-input-block"> <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> </div>
<div class="layui-form-item"> <div class="layui-form-item">

8
pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/bos/institution/InstitutionBO.java
View File

@ -25,6 +25,7 @@ public class InstitutionBO {
private String institutionRegionArea; private String institutionRegionArea;
private String institutionRegionVillage; private String institutionRegionVillage;
private String institutionRegionStreet; private String institutionRegionStreet;
private String institutionType;
private String creator; private String creator;
private String gmtCreate; private String gmtCreate;
private String modifier; private String modifier;
@ -192,4 +193,11 @@ public class InstitutionBO {
} }
public String getInstitutionType() {
return institutionType;
}
public void setInstitutionType(String institutionType) {
this.institutionType = institutionType;
}
} }

12
pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/dtos/institution/InstitutionDTO.java
View File

@ -44,9 +44,11 @@ public class InstitutionDTO {
private String institutionRegionVillage; private String institutionRegionVillage;
@ApiModelProperty(name = "institutionRegionStreet", value = "行政区化-街") @ApiModelProperty(name = "institutionRegionStreet", value = "行政区化-街")
private String institutionRegionStreet; private String institutionRegionStreet;
@ApiModelProperty(name = "creator", value = "") @ApiModelProperty(name = "institutionType", value = "机构类型")
private String institutionType;
@ApiModelProperty(name = "creator", value = "创建人")
private String creator; private String creator;
@ApiModelProperty(name = "gmtCreate", value = "") @ApiModelProperty(name = "gmtCreate", value = "创建时间")
private String gmtCreate; private String gmtCreate;
public String getInstitutionId() { public String getInstitutionId() {
@ -185,5 +187,11 @@ public class InstitutionDTO {
this.gmtCreate = gmtCreate; this.gmtCreate = gmtCreate;
} }
public String getInstitutionType() {
return institutionType;
}
public void setInstitutionType(String institutionType) {
this.institutionType = institutionType;
}
} }

8
pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/pos/institution/InstitutionPO.java
View File

@ -25,6 +25,7 @@ public class InstitutionPO {
private String institutionRegionArea; private String institutionRegionArea;
private String institutionRegionVillage; private String institutionRegionVillage;
private String institutionRegionStreet; private String institutionRegionStreet;
private String institutionType;
private String creator; private String creator;
private String gmtCreate; private String gmtCreate;
private String modifier; private String modifier;
@ -192,4 +193,11 @@ public class InstitutionPO {
} }
public String getInstitutionType() {
return institutionType;
}
public void setInstitutionType(String institutionType) {
this.institutionType = institutionType;
}
} }

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

@ -29,7 +29,6 @@ public class InstitutionVO {
@ApiModelProperty(name = "institutionY", value = "机构纬度") @ApiModelProperty(name = "institutionY", value = "机构纬度")
private String institutionY; private String institutionY;
@ApiModelProperty(name = "institutionFoundingTime", value = "机构成立时间") @ApiModelProperty(name = "institutionFoundingTime", value = "机构成立时间")
@CheckEmptyAnnotation(name = "机构成立时间", verifyType = "datetime")
private String institutionFoundingTime; private String institutionFoundingTime;
@ApiModelProperty(name = "institutionPrincipal", value = "机构负责人") @ApiModelProperty(name = "institutionPrincipal", value = "机构负责人")
private String institutionPrincipal; private String institutionPrincipal;
@ -45,6 +44,8 @@ public class InstitutionVO {
private String institutionRegionVillage; private String institutionRegionVillage;
@ApiModelProperty(name = "institutionRegionStreet", value = "行政区化-街") @ApiModelProperty(name = "institutionRegionStreet", value = "行政区化-街")
private String institutionRegionStreet; private String institutionRegionStreet;
@ApiModelProperty(name = "institutionType", value = "机构类型")
private String institutionType;
public String getInstitutionName() { public String getInstitutionName() {
return institutionName == null ? "" : institutionName.trim(); return institutionName == null ? "" : institutionName.trim();
@ -158,5 +159,11 @@ public class InstitutionVO {
this.institutionRegionStreet = institutionRegionStreet; this.institutionRegionStreet = institutionRegionStreet;
} }
public String getInstitutionType() {
return institutionType;
}
public void setInstitutionType(String institutionType) {
this.institutionType = institutionType;
}
} }

8
pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/bos/organization/OrganizationBO.java
View File

@ -16,6 +16,7 @@ public class OrganizationBO {
private String organizationPrincipal; private String organizationPrincipal;
private String organizationDesc; private String organizationDesc;
private String organizationImage; private String organizationImage;
private String organizationType;
private String creator; private String creator;
private String gmtCreate; private String gmtCreate;
private String modifier; private String modifier;
@ -111,4 +112,11 @@ public class OrganizationBO {
} }
public String getOrganizationType() {
return organizationType;
}
public void setOrganizationType(String organizationType) {
this.organizationType = organizationType;
}
} }

13
pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/dtos/organization/OrganizationDTO.java
View File

@ -26,9 +26,11 @@ public class OrganizationDTO {
private String organizationDesc; private String organizationDesc;
@ApiModelProperty(name = "organizationImage", value = "组织图片") @ApiModelProperty(name = "organizationImage", value = "组织图片")
private String organizationImage; private String organizationImage;
@ApiModelProperty(name = "creator", value = "") @ApiModelProperty(name = "organizationType", value = "组织类型")
private String organizationType;
@ApiModelProperty(name = "creator", value = "创建人")
private String creator; private String creator;
@ApiModelProperty(name = "gmtCreate", value = "") @ApiModelProperty(name = "gmtCreate", value = "创建时间")
private String gmtCreate; private String gmtCreate;
public String getOrganizationId() { public String getOrganizationId() {
@ -96,4 +98,11 @@ public class OrganizationDTO {
} }
public String getOrganizationType() {
return organizationType;
}
public void setOrganizationType(String organizationType) {
this.organizationType = organizationType;
}
} }

8
pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/pos/organization/OrganizationPO.java
View File

@ -16,6 +16,7 @@ public class OrganizationPO {
private String organizationPrincipal; private String organizationPrincipal;
private String organizationDesc; private String organizationDesc;
private String organizationImage; private String organizationImage;
private String organizationType;
private String creator; private String creator;
private String gmtCreate; private String gmtCreate;
private String modifier; private String modifier;
@ -111,4 +112,11 @@ public class OrganizationPO {
} }
public String getOrganizationType() {
return organizationType;
}
public void setOrganizationType(String organizationType) {
this.organizationType = organizationType;
}
} }

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

@ -19,7 +19,6 @@ public class OrganizationVO {
@ApiModelProperty(name = "organizationName", value = "组织名称") @ApiModelProperty(name = "organizationName", value = "组织名称")
private String organizationName; private String organizationName;
@ApiModelProperty(name = "organizationUserNum", value = "组织人员数量") @ApiModelProperty(name = "organizationUserNum", value = "组织人员数量")
@CheckNumberAnnotation(name = "组织人员数量")
private Integer organizationUserNum; private Integer organizationUserNum;
@ApiModelProperty(name = "organizationPrincipal", value = "组织负责人") @ApiModelProperty(name = "organizationPrincipal", value = "组织负责人")
private String organizationPrincipal; private String organizationPrincipal;
@ -27,6 +26,8 @@ public class OrganizationVO {
private String organizationDesc; private String organizationDesc;
@ApiModelProperty(name = "organizationImage", value = "组织图片") @ApiModelProperty(name = "organizationImage", value = "组织图片")
private String organizationImage; private String organizationImage;
@ApiModelProperty(name = "organizationType", value = "组织类型")
private String organizationType;
public String getOrganizationName() { public String getOrganizationName() {
return organizationName == null ? "" : organizationName.trim(); return organizationName == null ? "" : organizationName.trim();
@ -68,5 +69,11 @@ public class OrganizationVO {
this.organizationImage = organizationImage; this.organizationImage = organizationImage;
} }
public String getOrganizationType() {
return organizationType;
}
public void setOrganizationType(String organizationType) {
this.organizationType = organizationType;
}
} }