diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvDictDeviceCateController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvDictDeviceCateController.java index 46b3675..2b39222 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvDictDeviceCateController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvDictDeviceCateController.java @@ -210,4 +210,13 @@ public class SurvDictDeviceCateController extends JeecgController> getDeviceCateList() { + List list = fDictDeviceCateService.getDistinctDeployType(); + return Result.OK(list); + } + } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvDictDeviceCateMapper.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvDictDeviceCateMapper.java index 1010343..92f13ba 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvDictDeviceCateMapper.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvDictDeviceCateMapper.java @@ -15,4 +15,6 @@ import java.util.List; public interface SurvDictDeviceCateMapper extends BaseMapper { @InterceptorIgnore(tenantLine = "true") List listAll(SurvDictDeviceCate survDictDeviceCate); + + List getDistinctDeployType(); } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvDeviceDeployMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvDeviceDeployMapper.xml index 3a7bb44..8cb6b6d 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvDeviceDeployMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvDeviceDeployMapper.xml @@ -85,6 +85,9 @@ and STATION_CODE = #{query.stationCode} + + and DEPLOY_TYPE = #{query.deployType} + and DEVICE_CODE = #{query.deviceCode} diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvDictDeviceCateMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvDictDeviceCateMapper.xml index 23dc900..808a898 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvDictDeviceCateMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvDictDeviceCateMapper.xml @@ -26,4 +26,14 @@ from surv_dict_device_cate ORDER BY CONVERT(CATE_NAME USING gbk) ASC + + \ No newline at end of file diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/SurvDictDeviceCateService.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/SurvDictDeviceCateService.java index 468dda7..57c368f 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/SurvDictDeviceCateService.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/SurvDictDeviceCateService.java @@ -14,4 +14,6 @@ import java.util.List; public interface SurvDictDeviceCateService extends IService { List listAll(SurvDictDeviceCate survDictDeviceCate); + + List getDistinctDeployType(); } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvDictDeviceCateServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvDictDeviceCateServiceImpl.java index a8bb4d0..3f4af05 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvDictDeviceCateServiceImpl.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvDictDeviceCateServiceImpl.java @@ -6,10 +6,7 @@ import org.jeecg.modules.appmana.mapper.SurvDictDeviceCateMapper; import org.jeecg.modules.appmana.service.SurvDictDeviceCateService; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @Description: 设备种类字典 @@ -41,4 +38,9 @@ public class SurvDictDeviceCateServiceImpl extends ServiceImpl getDistinctDeployType() { + return baseMapper.getDistinctDeployType(); + } }