Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_java_monomer
This commit is contained in:
commit
20c9431e22
|
|
@ -4,11 +4,10 @@
|
|||
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-config-api</artifactId>
|
||||
<artifactId>nu-admin-api</artifactId>
|
||||
<version>2.0.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>nu-config-local-api</artifactId>
|
||||
<artifactId>nu-admin-local-api</artifactId>
|
||||
|
||||
</project>
|
||||
|
|
@ -4,16 +4,15 @@
|
|||
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-config</artifactId>
|
||||
<artifactId>nursing-unit-admin</artifactId>
|
||||
<version>2.0.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>nu-config-api</artifactId>
|
||||
<artifactId>nu-admin-api</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
<module>nu-config-local-api</module>
|
||||
<module>nu-admin-local-api</module>
|
||||
</modules>
|
||||
|
||||
<dependencies>
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
<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-admin</artifactId>
|
||||
<version>2.0.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>nu-admin-biz</artifactId>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.nursingunit.boot</groupId>
|
||||
<artifactId>nu-admin-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>
|
||||
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
|
|
@ -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,14 +7,14 @@
|
|||
<artifactId>nursing-unit-parent</artifactId>
|
||||
<version>2.0.0</version>
|
||||
</parent>
|
||||
<description>nu基础管理模块</description>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>nursing-unit-config</artifactId>
|
||||
<artifactId>nursing-unit-admin</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
<module>nu-config-api</module>
|
||||
<module>nu-config-biz</module>
|
||||
<module>nu-admin-api</module>
|
||||
<module>nu-admin-biz</module>
|
||||
</modules>
|
||||
|
||||
</project>
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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-invoicing-api</artifactId>
|
||||
<version>2.0.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>nu-invoicing-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-invoicing</artifactId>
|
||||
<version>2.0.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>nu-invoicing-api</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
<module>nu-invoicing-local-api</module>
|
||||
</modules>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.nursingunit.boot</groupId>
|
||||
<artifactId>nursing-unit-base-core</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
|
@ -3,17 +3,17 @@
|
|||
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-config</artifactId>
|
||||
<artifactId>nursing-unit-invoicing</artifactId>
|
||||
<version>2.0.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>nu-config-biz</artifactId>
|
||||
<artifactId>nu-invoicing-biz</artifactId>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.nursingunit.boot</groupId>
|
||||
<artifactId>nu-config-local-api</artifactId>
|
||||
<artifactId>nu-invoicing-local-api</artifactId>
|
||||
<version>${nursingunit.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
|
|||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("config_material_category")
|
||||
@TableName("nu_config_material_category")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="config_material_category对象", description="物料类别")
|
||||
|
|
@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
|
|||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("config_material_info")
|
||||
@TableName("nu_config_material_info")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="config_material_info对象", description="物料信息")
|
||||
|
|
@ -37,18 +37,18 @@ public class ConfigMaterialInfo implements Serializable {
|
|||
@ApiModelProperty(value = "id")
|
||||
private java.lang.String id;
|
||||
/**物料类别*/
|
||||
@Excel(name = "物料类别", width = 15, dictTable = "config_material_category", dicText = "category_name", dicCode = "id")
|
||||
@Dict(dictTable = "config_material_category", dicText = "category_name", dicCode = "id")
|
||||
@Excel(name = "物料类别", width = 15, dictTable = "nu_config_material_category", dicText = "category_name", dicCode = "id")
|
||||
@Dict(dictTable = "nu_config_material_category", dicText = "category_name", dicCode = "id")
|
||||
@ApiModelProperty(value = "物料类别")
|
||||
private java.lang.String categoryId;
|
||||
/**物料类型*/
|
||||
@Excel(name = "物料类型", width = 15, dictTable = "config_material_type", dicText = "type_name", dicCode = "id")
|
||||
@Dict(dictTable = "config_material_type", dicText = "type_name", dicCode = "id")
|
||||
@Excel(name = "物料类型", width = 15, dictTable = "nu_config_material_type", dicText = "type_name", dicCode = "id")
|
||||
@Dict(dictTable = "nu_config_material_type", dicText = "type_name", dicCode = "id")
|
||||
@ApiModelProperty(value = "物料类型")
|
||||
private java.lang.String typeId;
|
||||
/**用药类型*/
|
||||
@Excel(name = "用药类型", width = 15, dictTable = "config_material_medication", dicText = "medication_name", dicCode = "id")
|
||||
@Dict(dictTable = "config_material_medication", dicText = "medication_name", dicCode = "id")
|
||||
@Excel(name = "用药类型", width = 15, dictTable = "nu_config_material_medication", dicText = "medication_name", dicCode = "id")
|
||||
@Dict(dictTable = "nu_config_material_medication", dicText = "medication_name", dicCode = "id")
|
||||
@ApiModelProperty(value = "用药类型")
|
||||
private java.lang.String medicationId;
|
||||
/**货品名称*/
|
||||
|
|
@ -108,9 +108,9 @@ public class ConfigMaterialInfo implements Serializable {
|
|||
@ApiModelProperty(value = "多单位采购默认使用 0子集 1父级 2爷级")
|
||||
private java.lang.String multiUnitType;
|
||||
/**供应商*/
|
||||
@Excel(name = "供应商", width = 15,dictTable = "config_suppliers_info" , dicCode = "id" , dicText = "suppliers_name")
|
||||
@Excel(name = "供应商", width = 15,dictTable = "nu_config_suppliers_info" , dicCode = "id" , dicText = "suppliers_name")
|
||||
@ApiModelProperty(value = "供应商")
|
||||
@Dict(dictTable = "config_suppliers_info" , dicCode = "id" , dicText = "suppliers_name")
|
||||
@Dict(dictTable = "nu_config_suppliers_info" , dicCode = "id" , dicText = "suppliers_name")
|
||||
private java.lang.String suppliers;
|
||||
/**物料图片*/
|
||||
@ApiModelProperty(value = "物料图片")
|
||||
|
|
@ -27,7 +27,7 @@ import lombok.experimental.Accessors;
|
|||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("config_material_medication")
|
||||
@TableName("nu_config_material_medication")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="config_material_medication对象", description="物料用药类型")
|
||||
|
|
@ -39,13 +39,13 @@ public class ConfigMaterialMedication implements Serializable {
|
|||
@ApiModelProperty(value = "id")
|
||||
private java.lang.String id;
|
||||
/**物料类别*/
|
||||
@Excel(name = "物料类别", width = 15, dictTable = "config_material_category", dicText = "category_name", dicCode = "id")
|
||||
@Dict(dictTable = "config_material_category", dicText = "category_name", dicCode = "id")
|
||||
@Excel(name = "物料类别", width = 15, dictTable = "nu_config_material_category", dicText = "category_name", dicCode = "id")
|
||||
@Dict(dictTable = "nu_config_material_category", dicText = "category_name", dicCode = "id")
|
||||
@ApiModelProperty(value = "物料类别")
|
||||
private java.lang.String categoryId;
|
||||
/**物料类型*/
|
||||
@Excel(name = "物料类型", width = 15, dictTable = "config_material_type", dicText = "type_name", dicCode = "id")
|
||||
@Dict(dictTable = "config_material_type", dicText = "type_name", dicCode = "id")
|
||||
@Excel(name = "物料类型", width = 15, dictTable = "nu_config_material_type", dicText = "type_name", dicCode = "id")
|
||||
@Dict(dictTable = "nu_config_material_type", dicText = "type_name", dicCode = "id")
|
||||
@ApiModelProperty(value = "物料类型")
|
||||
private java.lang.String typeId;
|
||||
/**名称*/
|
||||
|
|
@ -27,7 +27,7 @@ import lombok.experimental.Accessors;
|
|||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("config_material_type")
|
||||
@TableName("nu_config_material_type")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="config_material_type对象", description="物料类型")
|
||||
|
|
@ -39,9 +39,9 @@ public class ConfigMaterialType implements Serializable {
|
|||
@ApiModelProperty(value = "id")
|
||||
private java.lang.String id;
|
||||
/**物料类别*/
|
||||
@Excel(name = "物料类别", width = 15,dictTable = "config_material_category" , dicText = "category_name" , dicCode = "id")
|
||||
@Excel(name = "物料类别", width = 15,dictTable = "nu_config_material_category" , dicText = "category_name" , dicCode = "id")
|
||||
@ApiModelProperty(value = "物料类别")
|
||||
@Dict(dictTable = "config_material_category" , dicText = "category_name" , dicCode = "id")
|
||||
@Dict(dictTable = "nu_config_material_category" , dicText = "category_name" , dicCode = "id")
|
||||
private java.lang.String categoryId;
|
||||
/**物料类型*/
|
||||
@Excel(name = "物料类型", width = 15)
|
||||
|
|
@ -13,9 +13,9 @@
|
|||
a.id as category_id,
|
||||
b.id as type_id,
|
||||
c.id as medication_id
|
||||
from config_material_category a
|
||||
LEFT JOIN config_material_type b on a.id = b.category_id and b.iz_enabled = 0 and b.del_flag = 0
|
||||
LEFT JOIN config_material_medication c on b.id = c.type_id and c.iz_enabled = 0 and c.del_flag = 0
|
||||
from nu_config_material_category a
|
||||
LEFT JOIN nu_config_material_type b on a.id = b.category_id and b.iz_enabled = 0 and b.del_flag = 0
|
||||
LEFT JOIN nu_config_material_medication c on b.id = c.type_id and c.iz_enabled = 0 and c.del_flag = 0
|
||||
where a.iz_enabled = 0 and a.del_flag = 0
|
||||
order by a.sort asc,b.id asc,c.id asc ) a
|
||||
${ew.customSqlSegment}
|
||||
|
|
@ -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;
|
||||
|
|
@ -27,10 +27,10 @@ import lombok.experimental.Accessors;
|
|||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("config_suppliers_info")
|
||||
@TableName("nu_config_suppliers_info")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="config_suppliers_info对象", description="供应商")
|
||||
@ApiModel(value="nu_config_suppliers_info对象", description="供应商")
|
||||
public class ConfigSuppliersInfo implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
|
@ -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-invoicing</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
<module>nu-invoicing-api</module>
|
||||
<module>nu-invoicing-biz</module>
|
||||
</modules>
|
||||
|
||||
</project>
|
||||
|
|
@ -26,12 +26,12 @@ import io.swagger.annotations.ApiOperation;
|
|||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 护理单元-物联管理-TPLINK机构信息
|
||||
* @Description: 护理单元-物联管理-TPLINK项目信息
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2025-01-22
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="护理单元-物联管理-TPLINK机构信息")
|
||||
@Api(tags="护理单元-物联管理-TPLINK项目信息")
|
||||
@RestController
|
||||
@RequestMapping("/iot/projectInfo")
|
||||
@Slf4j
|
||||
|
|
@ -48,8 +48,8 @@ public class ProjectInfoController extends JeecgController<ProjectInfo, IProject
|
|||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "护理单元-物联管理-TPLINK机构信息-分页列表查询")
|
||||
@ApiOperation(value="护理单元-物联管理-TPLINK机构信息-分页列表查询", notes="护理单元-物联管理-TPLINK机构信息-分页列表查询")
|
||||
//@AutoLog(value = "护理单元-物联管理-TPLINK项目信息-分页列表查询")
|
||||
@ApiOperation(value="护理单元-物联管理-TPLINK项目信息-分页列表查询", notes="护理单元-物联管理-TPLINK项目信息-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<ProjectInfo>> queryPageList(ProjectInfo projectInfo,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
|
|
@ -61,7 +61,7 @@ public class ProjectInfoController extends JeecgController<ProjectInfo, IProject
|
|||
}
|
||||
|
||||
/**
|
||||
* 同步机构信息
|
||||
* 同步项目信息
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -71,7 +71,7 @@ public class ProjectInfoController extends JeecgController<ProjectInfo, IProject
|
|||
}
|
||||
|
||||
/**
|
||||
* 异步查询机构list
|
||||
* 异步查询项目list
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/queryRegionTreeSync", method = RequestMethod.GET)
|
||||
|
|
@ -95,8 +95,8 @@ public class ProjectInfoController extends JeecgController<ProjectInfo, IProject
|
|||
* @param projectInfo
|
||||
* @return
|
||||
*/
|
||||
// @AutoLog(value = "护理单元-物联管理-TPLINK机构信息-添加")
|
||||
@ApiOperation(value="护理单元-物联管理-TPLINK机构信息-添加", notes="护理单元-物联管理-TPLINK机构信息-添加")
|
||||
// @AutoLog(value = "护理单元-物联管理-TPLINK项目信息-添加")
|
||||
@ApiOperation(value="护理单元-物联管理-TPLINK项目信息-添加", notes="护理单元-物联管理-TPLINK项目信息-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<String> add(@RequestBody ProjectInfo projectInfo) {
|
||||
return service.addProject(projectInfo);
|
||||
|
|
@ -108,8 +108,8 @@ public class ProjectInfoController extends JeecgController<ProjectInfo, IProject
|
|||
* @param projectInfo
|
||||
* @return
|
||||
*/
|
||||
// @AutoLog(value = "护理单元-物联管理-TPLINK机构信息-编辑")
|
||||
@ApiOperation(value="护理单元-物联管理-TPLINK机构信息-编辑", notes="护理单元-物联管理-TPLINK机构信息-编辑")
|
||||
// @AutoLog(value = "护理单元-物联管理-TPLINK项目信息-编辑")
|
||||
@ApiOperation(value="护理单元-物联管理-TPLINK项目信息-编辑", notes="护理单元-物联管理-TPLINK项目信息-编辑")
|
||||
@PostMapping(value = "/edit")
|
||||
public Result<String> edit(@RequestBody ProjectInfo projectInfo) {
|
||||
return service.editProject(projectInfo);
|
||||
|
|
@ -121,8 +121,8 @@ public class ProjectInfoController extends JeecgController<ProjectInfo, IProject
|
|||
* @param projectInfo
|
||||
* @return
|
||||
*/
|
||||
// @AutoLog(value = "护理单元-物联管理-TPLINK机构信息-编辑")
|
||||
@ApiOperation(value="护理单元-物联管理-TPLINK机构信息-通过id删除", notes="护理单元-物联管理-TPLINK机构信息-通过id删除")
|
||||
// @AutoLog(value = "护理单元-物联管理-TPLINK项目信息-编辑")
|
||||
@ApiOperation(value="护理单元-物联管理-TPLINK项目信息-通过id删除", notes="护理单元-物联管理-TPLINK项目信息-通过id删除")
|
||||
@PostMapping(value = "/delete")
|
||||
public Result<String> deleteProject(@RequestBody ProjectInfo projectInfo) {
|
||||
return service.deleteProject(projectInfo);
|
||||
|
|
@ -134,8 +134,8 @@ public class ProjectInfoController extends JeecgController<ProjectInfo, IProject
|
|||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "护理单元-物联管理-TPLINK机构信息-通过id查询")
|
||||
@ApiOperation(value="护理单元-物联管理-TPLINK机构信息-通过id查询", notes="护理单元-物联管理-TPLINK机构信息-通过id查询")
|
||||
//@AutoLog(value = "护理单元-物联管理-TPLINK项目信息-通过id查询")
|
||||
@ApiOperation(value="护理单元-物联管理-TPLINK项目信息-通过id查询", notes="护理单元-物联管理-TPLINK项目信息-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<ProjectInfo> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
ProjectInfo projectInfo = service.getById(id);
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ public interface ProjectInfoMapper extends BaseMapper<ProjectInfo> {
|
|||
IPage<ProjectInfo> findPage(Page<ProjectInfo> page, @Param("params") ProjectInfo projectInfo);
|
||||
int add(Map<String, String> map);
|
||||
int updateById(Map<String, String> map);
|
||||
int updateByProjectId(ProjectInfo projectInfo);
|
||||
int deleteByProjectId(String projectId);
|
||||
int updateLeafByPId(Map<String, String> map);
|
||||
List<ProjectInfo> queryTreeList();
|
||||
|
|
|
|||
|
|
@ -124,6 +124,58 @@
|
|||
</insert>
|
||||
|
||||
<update id="updateById">
|
||||
update nu_iot_tplink_project
|
||||
set
|
||||
<if test="projectName != null and projectName != ''">
|
||||
project_name = #{projectName},
|
||||
</if>
|
||||
<if test="institutionalId != null and institutionalId != ''">
|
||||
institutional_id = #{institutionalId},
|
||||
</if>
|
||||
<if test="createTime != null and createTime != ''">
|
||||
create_time = #{createTime},
|
||||
</if>
|
||||
<if test="deviceNum != null">
|
||||
device_num = #{deviceNum},
|
||||
</if>
|
||||
<if test="sort != null">
|
||||
sort = #{sort},
|
||||
</if>
|
||||
<if test="offlineNum != null">
|
||||
offline_num = #{offlineNum},
|
||||
</if>
|
||||
<if test="abnormalNum != null">
|
||||
abnormal_num = #{abnormalNum},
|
||||
</if>
|
||||
<if test="unreadMessageNum != null">
|
||||
unread_message_num = #{unreadMessageNum},
|
||||
</if>
|
||||
<if test="totalNmsDevNum != null">
|
||||
total_nms_dev_num = #{totalNmsDevNum},
|
||||
</if>
|
||||
<if test="totalVmsDevNum != null">
|
||||
total_vms_dev_num = #{totalVmsDevNum},
|
||||
</if>
|
||||
<if test="totalNbsDevNum != null">
|
||||
total_nbs_dev_num = #{totalNbsDevNum},
|
||||
</if>
|
||||
<if test="offlineNmsDevNum != null">
|
||||
offline_nms_dev_num = #{offlineNmsDevNum},
|
||||
</if>
|
||||
<if test="offlineVmsDevNum != null">
|
||||
offline_vms_dev_num = #{offlineVmsDevNum},
|
||||
</if>
|
||||
<if test="offlineNbsDevNum != null">
|
||||
offline_nbs_dev_num = #{offlineNbsDevNum},
|
||||
</if>
|
||||
<if test="runningTime != null">
|
||||
running_time = #{runningTime},
|
||||
</if>
|
||||
project_id = #{projectId}
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<update id="updateByProjectId">
|
||||
update nu_iot_tplink_project
|
||||
set project_id = #{projectId},
|
||||
project_name = #{projectName},
|
||||
|
|
@ -142,7 +194,7 @@
|
|||
offline_vms_dev_num = #{offlineVmsDevNum},
|
||||
offline_nbs_dev_num = #{offlineNbsDevNum},
|
||||
running_time = #{runningTime}
|
||||
where id = #{id}
|
||||
where project_id = #{projectId}
|
||||
</update>
|
||||
|
||||
<update id="deleteByProjectId">
|
||||
|
|
|
|||
|
|
@ -143,6 +143,10 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
|
|||
JSONObject jsonObject = new JSONObject(jsonResponse);
|
||||
String errorCode = jsonObject.getStr("error_code");
|
||||
if(errorCode.equals("0")){
|
||||
JSONObject result = (JSONObject)jsonObject.get("result");
|
||||
String projectId = result.getStr("projectId");
|
||||
projectInfo.setProjectId(projectId);
|
||||
this.save(projectInfo);
|
||||
sync();
|
||||
return Result.OK("项目添加成功！");
|
||||
}else{
|
||||
|
|
@ -165,6 +169,7 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
|
|||
JSONObject jsonObject = new JSONObject(jsonResponse);
|
||||
String errorCode = jsonObject.getStr("error_code");
|
||||
if(errorCode.equals("0")){
|
||||
baseMapper.updateByProjectId(projectInfo);
|
||||
sync();
|
||||
return Result.OK("项目编辑成功！");
|
||||
}else{
|
||||
|
|
|
|||
|
|
@ -22,12 +22,12 @@ import javax.servlet.http.HttpServletRequest;
|
|||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 护理单元-物联管理-TPLINK区域信息
|
||||
* @Description: 护理单元-物联管理-TPLINK分组信息
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2025-02-20
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="护理单元-物联管理-TPLINK区域信息")
|
||||
@Api(tags="护理单元-物联管理-TPLINK分组信息")
|
||||
@RestController
|
||||
@RequestMapping("/iot/regionInfo")
|
||||
@Slf4j
|
||||
|
|
@ -44,8 +44,8 @@ public class RegionInfoController extends JeecgController<RegionInfo, IRegionInf
|
|||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "护理单元-物联管理-TPLINK区域信息-分页列表查询")
|
||||
@ApiOperation(value="护理单元-物联管理-TPLINK区域信息-分页列表查询", notes="护理单元-物联管理-TPLINK区域信息-分页列表查询")
|
||||
//@AutoLog(value = "护理单元-物联管理-TPLINK分组信息-分页列表查询")
|
||||
@ApiOperation(value="护理单元-物联管理-TPLINK分组信息-分页列表查询", notes="护理单元-物联管理-TPLINK分组信息-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<RegionInfo>> queryPageList(RegionInfo regionInfo,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
|
|
@ -57,7 +57,7 @@ public class RegionInfoController extends JeecgController<RegionInfo, IRegionInf
|
|||
}
|
||||
|
||||
/**
|
||||
* 同步区域信息
|
||||
* 同步分组信息
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -67,7 +67,7 @@ public class RegionInfoController extends JeecgController<RegionInfo, IRegionInf
|
|||
}
|
||||
|
||||
/**
|
||||
* 同步子区域信息
|
||||
* 同步子分组信息
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -77,7 +77,7 @@ public class RegionInfoController extends JeecgController<RegionInfo, IRegionInf
|
|||
}
|
||||
|
||||
/**
|
||||
* 异步查询区域list
|
||||
* 异步查询分组list
|
||||
* @param parentId 父节点 异步加载时传递
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -102,8 +102,8 @@ public class RegionInfoController extends JeecgController<RegionInfo, IRegionInf
|
|||
* @param regionInfo
|
||||
* @return
|
||||
*/
|
||||
// @AutoLog(value = "护理单元-物联管理-TPLINK区域信息-添加")
|
||||
@ApiOperation(value="护理单元-物联管理-TPLINK区域信息-添加", notes="护理单元-物联管理-TPLINK区域信息-添加")
|
||||
// @AutoLog(value = "护理单元-物联管理-TPLINK分组信息-添加")
|
||||
@ApiOperation(value="护理单元-物联管理-TPLINK分组信息-添加", notes="护理单元-物联管理-TPLINK分组信息-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<String> add(@RequestBody RegionInfo regionInfo) {
|
||||
return service.addRegion(regionInfo);
|
||||
|
|
@ -115,8 +115,8 @@ public class RegionInfoController extends JeecgController<RegionInfo, IRegionInf
|
|||
* @param regionInfo
|
||||
* @return
|
||||
*/
|
||||
// @AutoLog(value = "护理单元-物联管理-TPLINK区域信息-编辑")
|
||||
@ApiOperation(value="护理单元-物联管理-TPLINK区域信息-编辑", notes="护理单元-物联管理-TPLINK区域信息-编辑")
|
||||
// @AutoLog(value = "护理单元-物联管理-TPLINK分组信息-编辑")
|
||||
@ApiOperation(value="护理单元-物联管理-TPLINK分组信息-编辑", notes="护理单元-物联管理-TPLINK分组信息-编辑")
|
||||
@PostMapping(value = "/edit")
|
||||
public Result<String> edit(@RequestBody RegionInfo regionInfo) {
|
||||
return service.editRegion(regionInfo);
|
||||
|
|
@ -128,8 +128,8 @@ public class RegionInfoController extends JeecgController<RegionInfo, IRegionInf
|
|||
* @param regionInfo
|
||||
* @return
|
||||
*/
|
||||
// @AutoLog(value = "护理单元-物联管理-TPLINK区域信息-编辑")
|
||||
@ApiOperation(value="护理单元-物联管理-TPLINK区域信息-通过id删除", notes="护理单元-物联管理-TPLINK区域信息-通过id删除")
|
||||
// @AutoLog(value = "护理单元-物联管理-TPLINK分组信息-编辑")
|
||||
@ApiOperation(value="护理单元-物联管理-TPLINK分组信息-通过id删除", notes="护理单元-物联管理-TPLINK分组信息-通过id删除")
|
||||
@PostMapping(value = "/delete")
|
||||
public Result<String> deleteRegion(@RequestBody RegionInfo regionInfo) {
|
||||
return service.deleteRegion(regionInfo);
|
||||
|
|
@ -141,8 +141,8 @@ public class RegionInfoController extends JeecgController<RegionInfo, IRegionInf
|
|||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "护理单元-物联管理-TPLINK区域信息-通过id查询")
|
||||
@ApiOperation(value="护理单元-物联管理-TPLINK区域信息-通过id查询", notes="护理单元-物联管理-TPLINK区域信息-通过id查询")
|
||||
//@AutoLog(value = "护理单元-物联管理-TPLINK分组信息-通过id查询")
|
||||
@ApiOperation(value="护理单元-物联管理-TPLINK分组信息-通过id查询", notes="护理单元-物联管理-TPLINK分组信息-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<RegionInfo> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
RegionInfo regionInfo = service.getById(id);
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
|
|||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description: 护理单元-物联管理-TPLINK区域信息
|
||||
* @Description: 护理单元-物联管理-TPLINK分组信息
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2025-02-20
|
||||
* @Version: V1.0
|
||||
|
|
@ -24,7 +24,7 @@ import java.io.Serializable;
|
|||
@TableName("nu_iot_tplink_region")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="nu_iot_tplink_region对象", description="护理单元-物联管理-TPLINK区域信息")
|
||||
@ApiModel(value="nu_iot_tplink_region对象", description="护理单元-物联管理-TPLINK分组信息")
|
||||
public class RegionInfo implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
|
@ -32,19 +32,19 @@ public class RegionInfo implements Serializable {
|
|||
@TableId(type = IdType.AUTO)
|
||||
@ApiModelProperty(value = "ID")
|
||||
private Integer id;
|
||||
/**区域ID*/
|
||||
@Excel(name = "区域ID", width = 15)
|
||||
@ApiModelProperty(value = "区域ID")
|
||||
/**分组ID*/
|
||||
@Excel(name = "分组ID", width = 15)
|
||||
@ApiModelProperty(value = "分组ID")
|
||||
private String regionId;
|
||||
/**区域名称*/
|
||||
@Excel(name = "区域名称", width = 15)
|
||||
@ApiModelProperty(value = "区域名称")
|
||||
/**分组名称*/
|
||||
@Excel(name = "分组名称", width = 15)
|
||||
@ApiModelProperty(value = "分组名称")
|
||||
private String regionName;
|
||||
/**区域层级*/
|
||||
@Excel(name = "区域层级", width = 15)
|
||||
@ApiModelProperty(value = "区域层级")
|
||||
/**分组层级*/
|
||||
@Excel(name = "分组层级", width = 15)
|
||||
@ApiModelProperty(value = "分组层级")
|
||||
private String regionLevel;
|
||||
/**区域次序，接口对应字段，在数据库中是关键字，数据库中用sort代替order*/
|
||||
/**分组次序，接口对应字段，在数据库中是关键字，数据库中用sort代替order*/
|
||||
@ApiModelProperty(value = "项目次序")
|
||||
@TableField(exist = false)
|
||||
private String order;
|
||||
|
|
@ -52,13 +52,13 @@ public class RegionInfo implements Serializable {
|
|||
@Excel(name = "项目次序", width = 15)
|
||||
@ApiModelProperty(value = "项目次序")
|
||||
private Integer sort;
|
||||
/**父区域ID*/
|
||||
@Excel(name = "父区域ID", width = 15)
|
||||
@ApiModelProperty(value = "父区域ID")
|
||||
/**父分组ID*/
|
||||
@Excel(name = "父分组ID", width = 15)
|
||||
@ApiModelProperty(value = "父分组ID")
|
||||
private String parentId;
|
||||
/**父区域ID*/
|
||||
@Excel(name = "父区域", width = 15)
|
||||
@ApiModelProperty(value = "父区域")
|
||||
/**父分组ID*/
|
||||
@Excel(name = "父分组", width = 15)
|
||||
@ApiModelProperty(value = "父分组")
|
||||
@TableField(exist = false)
|
||||
private String parentName;
|
||||
/**项目ID*/
|
||||
|
|
@ -78,13 +78,13 @@ public class RegionInfo implements Serializable {
|
|||
@Excel(name = "流道", width = 15)
|
||||
@ApiModelProperty(value = "流道")
|
||||
private String streamWay;
|
||||
/**是否有子区域*/
|
||||
@Excel(name = "是否有子区域", width = 15)
|
||||
@ApiModelProperty(value = "是否有子区域 0无 1有")
|
||||
/**是否有子分组*/
|
||||
@Excel(name = "是否有子分组", width = 15)
|
||||
@ApiModelProperty(value = "是否有子分组 0无 1有")
|
||||
private String hasChildren;
|
||||
/**区域类型*/
|
||||
@Excel(name = "区域类型", width = 15)
|
||||
@ApiModelProperty(value = "区域类型")
|
||||
/**分组类型*/
|
||||
@Excel(name = "分组类型", width = 15)
|
||||
@ApiModelProperty(value = "分组类型")
|
||||
private String regionType;
|
||||
/**更新时间*/
|
||||
@Excel(name = "更新时间", width = 15)
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 区域信息同步
|
||||
* 分组信息同步
|
||||
*/
|
||||
@Slf4j
|
||||
public class RegionSyncJob implements Job {
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @Description: 护理单元-物联管理-TPLINK区域信息
|
||||
* @Description: 护理单元-物联管理-TPLINK分组信息
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2025-02-20
|
||||
* @Version: V1.0
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import java.util.Objects;
|
|||
|
||||
/**
|
||||
* <p>
|
||||
* 区域表 存储区域结构数据的实体类
|
||||
* 分组表 存储分组结构数据的实体类
|
||||
* <p>
|
||||
*
|
||||
* @Author 曹磊
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ import com.nu.modules.tplink.region.model.RegionTreeModel;
|
|||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 护理单元-物联管理-TPLINK区域信息
|
||||
* @Description: 护理单元-物联管理-TPLINK分组信息
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2025-01-22
|
||||
* @Version: V1.0
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @Description: 护理单元-物联管理-TPLINK区域信息
|
||||
* @Description: 护理单元-物联管理-TPLINK分组信息
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2025-02-20
|
||||
* @Version: V1.0
|
||||
|
|
@ -37,7 +37,7 @@ public class RegionInfoServiceImpl extends ServiceImpl<RegionInfoMapper, RegionI
|
|||
private ProjectInfoMapper projectInfoMapper;
|
||||
|
||||
/**
|
||||
* 同步区域信息
|
||||
* 同步分组信息
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
|
|
@ -52,7 +52,7 @@ public class RegionInfoServiceImpl extends ServiceImpl<RegionInfoMapper, RegionI
|
|||
String errorCode = jsonObject.getStr("error_code");
|
||||
if(errorCode.equals("0")){
|
||||
sync(jsonResponse);
|
||||
return Result.OK("同步区域成功！");
|
||||
return Result.OK("同步分组成功！");
|
||||
}else{
|
||||
return Result.error(jsonObject.getStr("msg"));
|
||||
}
|
||||
|
|
@ -108,7 +108,7 @@ public class RegionInfoServiceImpl extends ServiceImpl<RegionInfoMapper, RegionI
|
|||
}
|
||||
|
||||
/**
|
||||
* 接口返回数据同步子区域入库
|
||||
* 接口返回数据同步子分组入库
|
||||
* @param regionInfo
|
||||
*/
|
||||
@Override
|
||||
|
|
@ -150,7 +150,7 @@ public class RegionInfoServiceImpl extends ServiceImpl<RegionInfoMapper, RegionI
|
|||
syncChildren(entity);
|
||||
}
|
||||
}
|
||||
return Result.OK("同步子区域成功！");
|
||||
return Result.OK("同步子分组成功！");
|
||||
}else{
|
||||
return Result.error(jsonObject.getStr("msg"));
|
||||
}
|
||||
|
|
@ -180,7 +180,7 @@ public class RegionInfoServiceImpl extends ServiceImpl<RegionInfoMapper, RegionI
|
|||
}
|
||||
|
||||
/**
|
||||
* 查询区域treeList
|
||||
* 查询分组treeList
|
||||
*
|
||||
* @param parentId
|
||||
* @return
|
||||
|
|
@ -206,6 +206,9 @@ public class RegionInfoServiceImpl extends ServiceImpl<RegionInfoMapper, RegionI
|
|||
StringBuffer sb = new StringBuffer();
|
||||
sb.append("{");
|
||||
sb.append("\"projectId\"").append(":").append("\"").append(regionInfo.getProjectId()).append("\",");
|
||||
if(regionInfo.getParentId()==null){
|
||||
regionInfo.setParentId("0");
|
||||
}
|
||||
sb.append("\"parentId\"").append(":").append("\"").append(regionInfo.getParentId()).append("\",");
|
||||
sb.append("\"regionName\"").append(":").append("\"").append(regionInfo.getRegionName()).append("\",");
|
||||
sb.append("\"sysType\"").append(":").append("3");
|
||||
|
|
@ -215,7 +218,7 @@ public class RegionInfoServiceImpl extends ServiceImpl<RegionInfoMapper, RegionI
|
|||
String errorCode = jsonObject.getStr("error_code");
|
||||
if(errorCode.equals("0")){
|
||||
sync(regionInfo);
|
||||
return Result.OK("区域添加成功！");
|
||||
return Result.OK("分组添加成功！");
|
||||
}else{
|
||||
return Result.error(jsonObject.getStr("msg"));
|
||||
}
|
||||
|
|
@ -237,7 +240,7 @@ public class RegionInfoServiceImpl extends ServiceImpl<RegionInfoMapper, RegionI
|
|||
String errorCode = jsonObject.getStr("error_code");
|
||||
if(errorCode.equals("0")){
|
||||
sync(regionInfo);
|
||||
return Result.OK("区域编辑成功！");
|
||||
return Result.OK("分组编辑成功！");
|
||||
}else{
|
||||
return Result.error(jsonObject.getStr("msg"));
|
||||
}
|
||||
|
|
@ -258,7 +261,7 @@ public class RegionInfoServiceImpl extends ServiceImpl<RegionInfoMapper, RegionI
|
|||
String errorCode = jsonObject.getStr("error_code");
|
||||
if(errorCode.equals("0")||errorCode.equals("-82401")){
|
||||
baseMapper.deleteByRegionId(regionInfo.getRegionId());
|
||||
return Result.OK("区域删除成功！");
|
||||
return Result.OK("分组删除成功！");
|
||||
}else{
|
||||
return Result.error(jsonObject.getStr("msg"));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
@ -26,6 +26,7 @@ import java.util.Arrays;
|
|||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @Description: 服务指令
|
||||
|
|
@ -69,6 +70,14 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
|
|||
customeRuleMap.put("izEnabled", QueryRuleEnum.LIKE_WITH_OR);
|
||||
QueryWrapper<ConfigServiceDirective> queryWrapper = QueryGenerator.initQueryWrapper(configServiceDirective, req.getParameterMap(), customeRuleMap);
|
||||
queryWrapper.select("id");
|
||||
//如果有服务指令需要提前查询下对应的服务指令id
|
||||
List<ConfigServiceDirective> directiveIds = null;
|
||||
if (StringUtils.isNotBlank(configServiceDirective.getTags())) {
|
||||
directiveIds = configServiceDirectiveService.queryDirectiveIdByTagIds(configServiceDirective.getTags());
|
||||
if(directiveIds != null && !directiveIds.isEmpty()){
|
||||
queryWrapper.in("id", directiveIds.stream().map(ConfigServiceDirective::getId).collect(Collectors.toList()));
|
||||
}
|
||||
}
|
||||
Page<ConfigServiceDirective> page = new Page<ConfigServiceDirective>(pageNo, pageSize);
|
||||
IPage<ConfigServiceDirective> list = configServiceDirectiveService.page(page, queryWrapper);
|
||||
List<ConfigServiceDirective> pageList = service.pageList(configServiceDirective, list);
|
||||
|
|
@ -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)
|
||||
|
|
@ -35,6 +35,12 @@ public interface ConfigServiceDirectiveMapper extends BaseMapper<ConfigServiceDi
|
|||
|
||||
int saveTags(@Param("directive") ConfigServiceDirective configServiceDirective);
|
||||
|
||||
/**
|
||||
* 根据指令标签查询对应的服务指令id
|
||||
* @return
|
||||
*/
|
||||
List<ConfigServiceDirective> queryDirectiveIdByTagIds(@Param("tagIds") String tagIds);
|
||||
|
||||
/**
|
||||
* 查询指令标签是否被使用
|
||||
* @return
|
||||
|
|
@ -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=")">
|
||||
|
|
@ -76,8 +76,15 @@
|
|||
ORDER BY c.category_id ASC, c.type_id ASC, c.instruction_tag_id ASC,c.create_time desc
|
||||
</select>
|
||||
|
||||
<select id="queryDirectiveIdByTagIds" resultType="com.nu.modules.serviceDirective.entity.ConfigServiceDirective">
|
||||
SELECT distinct directive_id as id FROM nu_directive_tag WHERE tag_id IN
|
||||
<foreach collection="tagIds.split(',')" item="tagId" open="(" separator="," close=")">
|
||||
#{tagId}
|
||||
</foreach>
|
||||
</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 +92,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>
|
||||
|
|
@ -32,4 +32,6 @@ public interface IConfigServiceDirectiveService extends IService<ConfigServiceDi
|
|||
* @param configServiceDirective
|
||||
*/
|
||||
void removeTags(ConfigServiceDirective configServiceDirective);
|
||||
|
||||
List<ConfigServiceDirective> queryDirectiveIdByTagIds(String tags);
|
||||
}
|
||||
|
|
@ -179,4 +179,9 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
|
|||
public void removeTags(ConfigServiceDirective configServiceDirective) {
|
||||
baseMapper.deleteTags(configServiceDirective);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ConfigServiceDirective> queryDirectiveIdByTagIds(String tags) {
|
||||
return baseMapper.queryDirectiveIdByTagIds(tags);
|
||||
}
|
||||
}
|
||||
|
|
@ -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>
|
||||
|
|
@ -24,10 +24,10 @@
|
|||
<artifactId>nursing-unit-demo</artifactId>
|
||||
<version>${nursingunit.version}</version>
|
||||
</dependency>
|
||||
<!-- CONFIG 模块 -->
|
||||
<!-- 进销存 模块 -->
|
||||
<dependency>
|
||||
<groupId>com.nursingunit.boot</groupId>
|
||||
<artifactId>nu-config-biz</artifactId>
|
||||
<artifactId>nu-invoicing-biz</artifactId>
|
||||
<version>${nursingunit.version}</version>
|
||||
</dependency>
|
||||
<!-- IOT 摄像头 模块 -->
|
||||
|
|
@ -36,7 +36,18 @@
|
|||
<artifactId>nu-iot-biz</artifactId>
|
||||
<version>${nursingunit.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- nu 基础模块 -->
|
||||
<dependency>
|
||||
<groupId>com.nursingunit.boot</groupId>
|
||||
<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>
|
||||
|
|
@ -15,6 +17,7 @@
|
|||
<modules>
|
||||
<!--新建模块需要修改 yourModuleName 替换为模块名称-->
|
||||
<module>nu-yourModuleName-api</module>
|
||||
<!--新建模块需要修改 yourModuleName 替换为模块名称-->
|
||||
<module>nu-yourModuleName-biz</module>
|
||||
</modules>
|
||||
|
||||
|
|
|
|||
11
pom.xml
11
pom.xml
|
|
@ -68,10 +68,19 @@
|
|||
</properties>
|
||||
|
||||
<modules>
|
||||
<!-- 框架基础包模块 -->
|
||||
<module>nursing-unit-base-core</module>
|
||||
<!-- 框架demo功能模块 -->
|
||||
<module>nursing-unit-demo</module>
|
||||
<module>nursing-unit-config</module>
|
||||
<!-- 进销存 -->
|
||||
<module>nursing-unit-invoicing</module>
|
||||
<!-- 摄像头 -->
|
||||
<module>nursing-unit-iot</module>
|
||||
<!-- nu基础模块 -->
|
||||
<module>nursing-unit-admin</module>
|
||||
<!-- 服务指令模块 -->
|
||||
<module>nursing-unit-service-directive</module>
|
||||
<!-- 系统模块 -->
|
||||
<module>nursing-unit-system</module>
|
||||
</modules>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue