调整框架结构
This commit is contained in:
parent
9f34947107
commit
2f3d6c38f0
|
|
@ -23,10 +23,10 @@ import java.util.Date;
|
|||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("dict_type")
|
||||
@TableName("nu_dict_type")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="dict_type对象", description="业务字典主表")
|
||||
@ApiModel(value="nu_dict_type对象", description="业务字典主表")
|
||||
public class DictType implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
|
@ -1,24 +1,20 @@
|
|||
package com.nu.modules.dictType.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import org.jeecg.common.constant.ProvinceCityArea;
|
||||
import org.jeecg.common.util.SpringContextUtils;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.jeecg.common.aspect.annotation.Dict;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.jeecg.common.aspect.annotation.Dict;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Description: dict_type_item
|
||||
|
|
@ -27,10 +23,10 @@ import lombok.experimental.Accessors;
|
|||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("dict_type_item")
|
||||
@TableName("nu_dict_type_item")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="dict_type_item对象", description="dict_type_item")
|
||||
@ApiModel(value="nu_dict_type_item对象", description="dict_type_item")
|
||||
public class DictTypeItem implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.nu.modules.demo.dictType.mapper.DictTypeItemMapper">
|
||||
<mapper namespace="com.nu.modules.dictType.mapper.DictTypeItemMapper">
|
||||
|
||||
</mapper>
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.nu.modules.demo.dictType.mapper.DictTypeMapper">
|
||||
<mapper namespace="com.nu.modules.dictType.mapper.DictTypeMapper">
|
||||
|
||||
</mapper>
|
||||
|
|
@ -7,6 +7,7 @@
|
|||
<artifactId>nursing-unit-parent</artifactId>
|
||||
<version>2.0.0</version>
|
||||
</parent>
|
||||
<description>nu基础管理模块</description>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>nursing-unit-admin</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
<artifactId>nursing-unit-parent</artifactId>
|
||||
<version>2.0.0</version>
|
||||
</parent>
|
||||
<description>框架基础模块</description>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>nursing-unit-base-core</artifactId>
|
||||
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>aliyun</id>
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
<artifactId>nursing-unit-parent</artifactId>
|
||||
<version>2.0.0</version>
|
||||
</parent>
|
||||
<description>框架demo模块</description>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>nursing-unit-demo</artifactId>
|
||||
|
||||
<dependencies>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialCategoryMapper;
|
|||
import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialMedicationMapper;
|
||||
import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialTypeMapper;
|
||||
import com.nu.modules.ConfigMaterial.service.IConfigMaterialCategoryService;
|
||||
import com.nu.modules.serviceDirective.entity.ConfigServiceDirective;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
<artifactId>nursing-unit-parent</artifactId>
|
||||
<version>2.0.0</version>
|
||||
</parent>
|
||||
<description>进销存</description>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>nursing-unit-invoicing</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
<artifactId>nursing-unit-parent</artifactId>
|
||||
<version>2.0.0</version>
|
||||
</parent>
|
||||
<description>摄像头</description>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>nursing-unit-iot</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<groupId>com.nursingunit.boot</groupId>
|
||||
<artifactId>nu-service-directive-api</artifactId>
|
||||
<version>2.0.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>nu-service-directive-local-api</artifactId>
|
||||
|
||||
</project>
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<groupId>com.nursingunit.boot</groupId>
|
||||
<artifactId>nursing-unit-service-directive</artifactId>
|
||||
<version>2.0.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>nu-service-directive-api</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
<module>nu-service-directive-local-api</module>
|
||||
</modules>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.nursingunit.boot</groupId>
|
||||
<artifactId>nursing-unit-base-core</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<groupId>com.nursingunit.boot</groupId>
|
||||
<artifactId>nursing-unit-service-directive</artifactId>
|
||||
<version>2.0.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>nu-service-directive-biz</artifactId>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.nursingunit.boot</groupId>
|
||||
<artifactId>nu-service-directive-local-api</artifactId>
|
||||
<version>${nursingunit.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.hibernate</groupId>
|
||||
<artifactId>hibernate-core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jeecgframework.boot</groupId>
|
||||
<artifactId>hibernate-re</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- 企业微信/钉钉 api -->
|
||||
<dependency>
|
||||
<groupId>org.jeecgframework</groupId>
|
||||
<artifactId>weixin4j</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- 添加汉字转拼音依赖-->
|
||||
<dependency>
|
||||
<groupId>com.belerweb</groupId>
|
||||
<artifactId>pinyin4j</artifactId>
|
||||
<version>2.5.0</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
|
|
@ -27,10 +27,10 @@ import lombok.experimental.Accessors;
|
|||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("config_service_type")
|
||||
@TableName("nu_config_service_type")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="config_service_type对象", description="服务类型")
|
||||
@ApiModel(value="nu_config_service_type对象", description="服务类型")
|
||||
public class ConfigServiceType implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
|
@ -41,7 +41,7 @@ public class ConfigServiceType implements Serializable {
|
|||
/**服务类别id*/
|
||||
@Excel(name = "服务类别", width = 15)
|
||||
@ApiModelProperty(value = "服务类别")
|
||||
@Dict(dicCode = "id" , dictTable = "config_service_category" , dicText = "category_name")
|
||||
@Dict(dicCode = "id" , dictTable = "nu_config_service_category" , dicText = "category_name")
|
||||
private java.lang.String categoryId;
|
||||
/**服务类型名称*/
|
||||
@Excel(name = "服务类型名称", width = 15)
|
||||
|
|
@ -27,10 +27,10 @@ import lombok.experimental.Accessors;
|
|||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("config_directive_tag")
|
||||
@TableName("nu_config_directive_tag")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="config_directive_tag对象", description="指令标签")
|
||||
@ApiModel(value="nu_config_directive_tag对象", description="指令标签")
|
||||
public class DirectiveTag implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
|
@ -27,10 +27,10 @@ import lombok.experimental.Accessors;
|
|||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("config_service_category")
|
||||
@TableName("nu_config_service_category")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="config_service_category对象", description="服务类别")
|
||||
@ApiModel(value="nu_config_service_category对象", description="服务类别")
|
||||
public class ConfigServiceCategory implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
|
@ -22,10 +22,10 @@ import java.util.List;
|
|||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("config_service_directive")
|
||||
@TableName("nu_config_service_directive")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="config_service_directive对象", description="服务指令")
|
||||
@ApiModel(value="nu_config_service_directive对象", description="服务指令")
|
||||
public class ConfigServiceDirective implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
|
@ -36,12 +36,12 @@ public class ConfigServiceDirective implements Serializable {
|
|||
/**服务类别id*/
|
||||
@Excel(name = "服务类别", width = 15)
|
||||
@ApiModelProperty(value = "服务类别")
|
||||
@Dict(dicCode = "id" , dictTable = "config_service_category" , dicText = "category_name")
|
||||
@Dict(dicCode = "id" , dictTable = "nu_config_service_category" , dicText = "category_name")
|
||||
private java.lang.String categoryId;
|
||||
/**服务类型id*/
|
||||
@Excel(name = "服务类型", width = 15)
|
||||
@ApiModelProperty(value = "服务类型")
|
||||
@Dict(dicCode = "id" , dictTable = "config_service_type" , dicText = "type_name")
|
||||
@Dict(dicCode = "id" , dictTable = "nu_config_service_type" , dicText = "type_name")
|
||||
private java.lang.String typeId;
|
||||
/**分类标签*/
|
||||
@Excel(name = "分类标签", width = 15)
|
||||
|
|
@ -64,9 +64,9 @@
|
|||
c.mp4_file,
|
||||
tag.id as tagId,
|
||||
tag.tag_name as tagName
|
||||
FROM config_service_directive c
|
||||
LEFT JOIN directive_tag d ON c.id = d.directive_id
|
||||
LEFT JOIN config_directive_tag tag ON d.tag_id = tag.id
|
||||
FROM nu_config_service_directive c
|
||||
LEFT JOIN nu_directive_tag d ON c.id = d.directive_id
|
||||
LEFT JOIN nu_config_directive_tag tag ON d.tag_id = tag.id
|
||||
<where>
|
||||
c.id IN
|
||||
<foreach collection="ids" item="item" open="(" separator="," close=")">
|
||||
|
|
@ -77,7 +77,7 @@
|
|||
</select>
|
||||
|
||||
<select id="queryCountByTagIds" resultType="java.lang.Integer">
|
||||
SELECT COUNT(*) FROM directive_tag WHERE tag_id IN
|
||||
SELECT COUNT(*) FROM nu_directive_tag WHERE tag_id IN
|
||||
<foreach collection="tagIds" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
|
|
@ -85,12 +85,12 @@
|
|||
|
||||
<delete id="deleteTags">
|
||||
delete
|
||||
from directive_tag
|
||||
from nu_directive_tag
|
||||
where directive_id = #{directive.id}
|
||||
</delete>
|
||||
|
||||
<insert id="saveTags">
|
||||
insert into directive_tag (directive_id,tag_id) values
|
||||
insert into nu_directive_tag (directive_id,tag_id) values
|
||||
<foreach collection="directive.tags.split(',')" item="tagId" separator=",">
|
||||
(#{directive.id}, #{tagId})
|
||||
</foreach>
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<groupId>com.nursingunit.boot</groupId>
|
||||
<artifactId>nursing-unit-parent</artifactId>
|
||||
<version>2.0.0</version>
|
||||
</parent>
|
||||
<description>服务指令</description>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>nursing-unit-service-directive</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
<module>nu-service-directive-api</module>
|
||||
<module>nu-service-directive-biz</module>
|
||||
</modules>
|
||||
|
||||
</project>
|
||||
|
|
@ -42,6 +42,12 @@
|
|||
<artifactId>nu-admin-biz</artifactId>
|
||||
<version>${nursingunit.version}</version>
|
||||
</dependency>
|
||||
<!-- 服务指令 模块 -->
|
||||
<dependency>
|
||||
<groupId>com.nursingunit.boot</groupId>
|
||||
<artifactId>nu-service-directive-biz</artifactId>
|
||||
<version>${nursingunit.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- flyway 数据库自动升级 -->
|
||||
<dependency>
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
<artifactId>nursing-unit-parent</artifactId>
|
||||
<version>2.0.0</version>
|
||||
</parent>
|
||||
<description>框架系统模块</description>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>nursing-unit-system</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@
|
|||
<artifactId>nursing-unit-parent</artifactId>
|
||||
<version>2.0.0</version>
|
||||
</parent>
|
||||
<!--新建模块需要修改 yourModuleName替换为模块功能-->
|
||||
<description>XXX功能模块</description>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<!--新建模块需要修改 yourModuleName替换为模块名称-->
|
||||
<artifactId>nursing-unit-yourModuleName</artifactId>
|
||||
|
|
|
|||
Loading…
Reference in New Issue