部件字典管理接口和部件po

energy-manage-service/src/main/java/com/energy/manage/service/controller/units/UnitController.java

@@ -0,0 +1,63 @@
+package com.energy.manage.service.controller.units;
+
+
+import com.energy.manage.common.reponse.ResultResp;
+import com.energy.manage.service.config.annotations.UserLoginToken;
+import com.energy.manage.service.controller.base.BaseServiceController;
+import com.energy.manage.service.domain.dto.units.UnitDictBrandModelDto;
+import com.energy.manage.service.domain.dto.units.UnitDictConstantsDelDto;
+import com.energy.manage.service.domain.dto.units.UnitDictRoutineDto;
+import com.energy.manage.service.domain.vo.units.UnitDictRoutineListVo;
+import com.energy.manage.service.service.units.UnitService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Slf4j
+@RestController
+@CrossOrigin
+@Api(value = "UnitController", tags = "风机部件管理接口")
+@RequestMapping(value = "/api/unit")
+public class UnitController extends BaseServiceController {
+
+
+    @Autowired
+    private UnitService unitService;
+
+
+    @UserLoginToken
+    @PostMapping(value = "/getBrandModelNameOrModelNumber")
+    @ApiOperation(value = "根据部件类型，查询部件类型对应品牌/型号")
+    public ResultResp<List<String>> getBrandModelNameOrModelNumber(@RequestBody @Valid UnitDictBrandModelDto unitDictBrandModelDto) {
+        if(unitDictBrandModelDto.getUnitType()==null){
+            log.error("查询部件，部件类型unitType不能为空");
+            return ResultResp.NOTNULLPARAM();
+        }
+        List<String> list = unitService.getBrandModelNameOrModelNumber(unitDictBrandModelDto);
+        return ResultResp.SUCCESS(list);
+    }
+
+
+
+    @UserLoginToken
+    @PostMapping(value = "/getUnitDictRoutineList")
+    @ApiOperation(value = "根据部件类型，查询部件常用类型字典")
+    public ResultResp<List<UnitDictRoutineListVo>> getUnitDictRoutineList(@RequestBody @Valid UnitDictRoutineDto unitDictRoutineDto) {
+        List<UnitDictRoutineListVo> list = unitService.getUnitDictRoutineList(unitDictRoutineDto);
+        return ResultResp.SUCCESS(list);
+    }
+
+
+
+
+
+
+
+
+
+}

energy-manage-service/src/main/java/com/energy/manage/service/controller/units/UnitsDictController.java → energy-manage-service/src/main/java/com/energy/manage/service/controller/units/UnitDictController.java

@@ -1,6 +1,7 @@
 package com.energy.manage.service.controller.units;
 
 
+import cn.hutool.core.bean.BeanUtil;
 import com.energy.manage.common.base.Page;
 import com.energy.manage.common.enums.IdPrefixEnum;
 import com.energy.manage.common.reponse.ResultResp;
@@ -25,9 +26,9 @@ import java.util.List;
 @Slf4j
 @RestController
 @CrossOrigin
-@Api(value = "UnitsDictController", tags = "风机部件字典管理")
-@RequestMapping(value = "/api/units/dict")
-public class UnitsDictController extends BaseServiceController {
+@Api(value = "UnitDictController", tags = "风机部件字典管理")
+@RequestMapping(value = "/api/unit/dict")
+public class UnitDictController extends BaseServiceController {
 
 
     @Autowired
@@ -38,7 +39,7 @@ public class UnitsDictController extends BaseServiceController {
     @PostMapping(value = "/createUnitDict")
     @ApiOperation(value = "创建数据字典")
     public ResultResp createUnitDict(@RequestBody @Valid UnitDictConstantsDto unitDictConstantsDto) {
-        if (unitDictConstantsDto.getParentId()!=0) {
+        if (unitDictConstantsDto.getParentId() != 0) {
             return ResultResp.FAIL("数据字典级别不对");
         }
         unitDictConstantsDto.setCreateBy(getUserId());
@@ -77,12 +78,11 @@ public class UnitsDictController extends BaseServiceController {
     }
 
 
-
     @UserLoginToken
     @PostMapping(value = "/createUnitDictProperty")
     @ApiOperation(value = "创建数据字典属性-常规类型")
     public ResultResp createUnitDictProperty(@RequestBody @Valid UnitDictConstantsDto unitDictConstantsDto) {
-        if (unitDictConstantsDto.getParentId()<=0) {
+        if (unitDictConstantsDto.getParentId() <= 0) {
             return ResultResp.FAIL("数据字典级别不对");
         }
         if (StringUtils.isEmpty(unitDictConstantsDto.getContentsType())) {
@@ -126,7 +126,6 @@ public class UnitsDictController extends BaseServiceController {
     }
 
 
-
     @UserLoginToken
     @PostMapping(value = "/getUnitDictConstants")
     @ApiOperation(value = "查询字典属性对象-品牌型号")
@@ -140,6 +139,14 @@ public class UnitsDictController extends BaseServiceController {
     @PostMapping(value = "/saveUnitDictBrandModel")
     @ApiOperation(value = "创建部件品牌型号-品牌型号")
     public ResultResp saveUnitDictBrandModel(@RequestBody @Valid UnitDictBrandModelDto unitDictBrandModelDto) {
+
+        if(StringUtils.isEmpty(unitDictBrandModelDto.getManufacture())
+                || StringUtils.isEmpty(unitDictBrandModelDto.getModelNumber())){
+            return ResultResp.NOTNULLPARAM();
+        }
+        if(unitDictConstantsService.verifyUnitDictBrandModel(unitDictBrandModelDto)){
+            return ResultResp.FAIL("品牌型号已经存在!");
+        }
         boolean flg = unitDictConstantsService.saveUnitDictBrandModel(unitDictBrandModelDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -147,8 +154,19 @@ public class UnitsDictController extends BaseServiceController {
 
     @UserLoginToken
     @PostMapping(value = "/updateUnitDictBrandModel")
-    @ApiOperation(value = "更新部件品牌型号2-品牌型号")
+    @ApiOperation(value = "更新部件品牌型号-品牌型号")
     public ResultResp updateUnitDictBrandModel(@RequestBody @Valid UnitDictBrandModelUpdateDto unitDictBrandModelUpdateDto) {
+        if(StringUtils.isEmpty(unitDictBrandModelUpdateDto.getManufacture())
+                || StringUtils.isEmpty(unitDictBrandModelUpdateDto.getModelNumber())){
+            return ResultResp.NOTNULLPARAM();
+        }
+
+        UnitDictBrandModelDto dto = new UnitDictBrandModelDto();
+        BeanUtil.copyProperties(unitDictBrandModelUpdateDto,dto);
+
+        if(unitDictConstantsService.verifyUnitDictBrandModel(dto)){
+            return ResultResp.FAIL("品牌型号已经存在!");
+        }
         boolean flg = unitDictConstantsService.updateUnitDictBrandModel(unitDictBrandModelUpdateDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -176,5 +194,4 @@ public class UnitsDictController extends BaseServiceController {
 
 
 
-
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictBrandModelDto.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 @Getter
 @Setter
 @ApiModel("创建部件品牌参数")
@@ -12,7 +14,8 @@ public class UnitDictBrandModelDto {
 
     // 部件类型
     @ApiModelProperty("部件类型")
-    private String unitType;
+    @NotNull(message = "部件类型不能为空")
+    private Integer unitType;
 
     //  品牌
     @ApiModelProperty("品牌")

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictBrandModelIdDto.java

@@ -5,12 +5,15 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 @Getter
 @Setter
 @ApiModel("删除部件品牌参数")
 public class UnitDictBrandModelIdDto {
 
     @ApiModelProperty("主键")
+    @NotNull(message = "主键不能为空")
     private Integer id;
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictBrandModelUpdateDto.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 @Getter
 @Setter
 @ApiModel("更新风机部件品牌参数")
@@ -12,10 +14,12 @@ public class UnitDictBrandModelUpdateDto {
 
 
     @ApiModelProperty("主键")
+    @NotNull(message = "主键不能为空")
     private Integer id;
 
     // 部件类型
     @ApiModelProperty("部件类型")
+    @NotNull(message = "部件类型不能为空")
     private String unitType;
 
     //  品牌

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictRoutineDto.java

@@ -0,0 +1,24 @@
+package com.energy.manage.service.domain.dto.units;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@ApiModel("")
+public class UnitDictRoutineDto {
+
+    /**
+     * 字典/属性类型编号,查询部件常用字典集合参数，只需要传contentsType这一个参数
+     */
+    @ApiModelProperty("字典/属性类型编号,查询部件常用字典集合参数，只需要传contentsType这一个参数")
+    @NotNull(message = "部件字典类型编号不能为空")
+    private String contentsType;
+
+
+
+}

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/units/UnitDictRoutineListVo.java

@@ -0,0 +1,24 @@
+package com.energy.manage.service.domain.vo.units;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 部件常规字典属性
+ */
+@Getter
+@Setter
+public class UnitDictRoutineListVo {
+
+    /**
+     * 字典key
+     */
+    private Integer keyId;
+
+    /**
+     * 字典名字
+     */
+    private String valueName;
+
+
+}

energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitDictBrandModelMapper.java

@@ -3,8 +3,30 @@ package com.energy.manage.service.mappers.units;
 import com.energy.manage.common.mapper.MyMapper;
 import com.energy.manage.common.po.units.UnitDictBrandModelPO;
 import com.energy.manage.common.po.units.UnitDictConstantsPO;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface UnitDictBrandModelMapper extends MyMapper<UnitDictBrandModelPO> {
+
+    /**
+     * 查询品牌
+     * @param unitType
+     * @return
+     */
+    List<String> selectUnitManufactureByUnitType(@Param("unitType")Integer unitType);
+
+    /**
+     * 查询品牌对应型号
+     * @param unitType
+     * @param manufacture
+     * @return
+     */
+    List<String> selectUnitModelNumberByManufacture(@Param("unitType")Integer unitType,
+                                                    @Param("manufacture")String manufacture);
+
+
+
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/units/UnitDictConstantsService.java

@@ -114,8 +114,19 @@ public interface UnitDictConstantsService  {
     boolean delUnitDictBrandModel(UnitDictBrandModelIdDto unitDictBrandModelIdDto);
 
 
+    /**
+     * 通过部件类型/品牌名称查询集合
+     * @param unitDictBrandModelDto
+     * @return
+     */
+    List<String> getUnitDictBrandModelList(UnitDictBrandModelDto unitDictBrandModelDto);
 
-
+    /**
+     * 验证品牌型号在数据库中是否存在
+     * @param dto
+     * @return
+     */
+    boolean verifyUnitDictBrandModel(UnitDictBrandModelDto dto);
 
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/units/UnitService.java

@@ -0,0 +1,30 @@
+package com.energy.manage.service.service.units;
+
+import com.energy.manage.service.domain.dto.units.UnitDictBrandModelDto;
+import com.energy.manage.service.domain.dto.units.UnitDictRoutineDto;
+import com.energy.manage.service.domain.vo.units.UnitDictRoutineListVo;
+
+import java.util.List;
+
+/**
+ * 部件接口
+ */
+public interface UnitService {
+
+    /**
+     * 查询部件字典常用类型属性
+     * @param unitDictRoutineDto
+     * @return
+     */
+    List<UnitDictRoutineListVo> getUnitDictRoutineList(UnitDictRoutineDto unitDictRoutineDto);
+
+    /**
+     * 通过部件类型/品牌名称查询集合
+     * @param unitDictBrandModelDto
+     * @return
+     */
+    List<String> getBrandModelNameOrModelNumber (UnitDictBrandModelDto unitDictBrandModelDto);
+
+
+
+}

energy-manage-service/src/main/java/com/energy/manage/service/service/units/impl/UnitDictConstantsServiceImpl.java

@@ -25,6 +25,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 
 import java.util.Date;
@@ -50,12 +51,13 @@ public class UnitDictConstantsServiceImpl extends BaseServiceImpl<UnitDictConsta
     private UnitDictBrandModelMapper unitDictBrandModelMapper;
 
     // 定义字典中部件模块类型
-    private  final  int unit_module_number  = 3;
+    private final int unit_module_number = 3;
 
     // 定义字典中部件类型
-    private  final  int associated_function_type_number  = 5;
+    private final int associated_function_type_number = 5;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean saveUnitDict(UnitDictConstantsDto unitDictConstantsDto) {
 
         UnitDictConstantsPO unitDictConstantsPO = new UnitDictConstantsPO();
@@ -78,10 +80,11 @@ public class UnitDictConstantsServiceImpl extends BaseServiceImpl<UnitDictConsta
         unitDictConstantsPO.setCreateTime(new Date());
         unitDictConstantsPO.setUpdateTime(new Date());
 
-        return dictConstantsMapper.insertUseGeneratedKeys(unitDictConstantsPO) > 0 ;
+        return dictConstantsMapper.insertUseGeneratedKeys(unitDictConstantsPO) > 0;
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean updateUnitDict(UnitDictConstantsUpdateDto unitDictConstantsUpdateDto) {
 
         UnitDictConstantsPO po = new UnitDictConstantsPO();
@@ -95,6 +98,7 @@ public class UnitDictConstantsServiceImpl extends BaseServiceImpl<UnitDictConsta
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean delUnitDict(UnitDictConstantsDelDto unitDictConstantsDelDto) {
         UnitDictConstantsPO po = new UnitDictConstantsPO();
         po.setDelState(DeleteStatusEnum.DELETE.getCode());
@@ -136,6 +140,7 @@ public class UnitDictConstantsServiceImpl extends BaseServiceImpl<UnitDictConsta
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean saveUnitDictProperty(UnitDictConstantsDto unitDictConstantsDto) {
 
         UnitDictConstantsPO unitDictConstantsPO = new UnitDictConstantsPO();
@@ -143,16 +148,17 @@ public class UnitDictConstantsServiceImpl extends BaseServiceImpl<UnitDictConsta
         unitDictConstantsPO.setDelState(DeleteStatusEnum.NODELETE.getCode());
 
         // 初始化字典值
-       long contentsValue = cacheService.incr(ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_UDPC_KEY, unitDictConstantsDto.getContentsType()));
+        long contentsValue = cacheService.incr(ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_UDPC_KEY, unitDictConstantsDto.getContentsType()));
 
         unitDictConstantsPO.setContentsValue(Integer.valueOf(String.valueOf(contentsValue)));
         unitDictConstantsPO.setCreateTime(new Date());
         unitDictConstantsPO.setUpdateTime(new Date());
 
-        return dictConstantsMapper.insertUseGeneratedKeys(unitDictConstantsPO) > 0 ;
+        return dictConstantsMapper.insertUseGeneratedKeys(unitDictConstantsPO) > 0;
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean delUnitDictProperty(UnitDictConstantsPDelDto unitDictConstantsPDelDto) {
 
         UnitDictConstantsPO po = new UnitDictConstantsPO();
@@ -168,6 +174,7 @@ public class UnitDictConstantsServiceImpl extends BaseServiceImpl<UnitDictConsta
 
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean updateUnitDictProperty(UnitDictConstantsUpdateDto unitDictConstantsUpdateDto) {
 
         UnitDictConstantsPO po = new UnitDictConstantsPO();
@@ -202,8 +209,8 @@ public class UnitDictConstantsServiceImpl extends BaseServiceImpl<UnitDictConsta
     @Override
     public UnitDictConstantsVo getUnitDictConstants(Integer id) {
         UnitDictConstantsVo vo = new UnitDictConstantsVo();
-        UnitDictConstantsPO po =  dictConstantsMapper.selectByPrimaryKey(id);
-        BeanUtil.copyProperties(po,vo);
+        UnitDictConstantsPO po = dictConstantsMapper.selectByPrimaryKey(id);
+        BeanUtil.copyProperties(po, vo);
         return vo;
     }
 
@@ -236,14 +243,16 @@ public class UnitDictConstantsServiceImpl extends BaseServiceImpl<UnitDictConsta
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean saveUnitDictBrandModel(UnitDictBrandModelDto unitDictBrandModelDto) {
         UnitDictBrandModelPO po = new UnitDictBrandModelPO();
         BeanUtil.copyProperties(unitDictBrandModelDto, po);
         po.setCreateTime(new Date());
-        return  unitDictBrandModelMapper.insertUseGeneratedKeys(po)>0;
+        return unitDictBrandModelMapper.insertUseGeneratedKeys(po) > 0;
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean updateUnitDictBrandModel(UnitDictBrandModelUpdateDto unitDictBrandModelUpdateDto) {
         UnitDictBrandModelPO po = new UnitDictBrandModelPO();
         po.setManufacture(unitDictBrandModelUpdateDto.getManufacture());
@@ -255,8 +264,29 @@ public class UnitDictConstantsServiceImpl extends BaseServiceImpl<UnitDictConsta
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean delUnitDictBrandModel(UnitDictBrandModelIdDto unitDictBrandModelIdDto) {
-        return unitDictBrandModelMapper.deleteByPrimaryKey(unitDictBrandModelIdDto.getId())>0;
+        return unitDictBrandModelMapper.deleteByPrimaryKey(unitDictBrandModelIdDto.getId()) > 0;
+    }
+
+    @Override
+    public List<String> getUnitDictBrandModelList(UnitDictBrandModelDto unitDictBrandModelDto) {
+        if (StringUtils.isEmpty(unitDictBrandModelDto.getManufacture())) {
+            return unitDictBrandModelMapper.selectUnitManufactureByUnitType(unitDictBrandModelDto.getUnitType());
+        }
+        return unitDictBrandModelMapper.selectUnitModelNumberByManufacture(unitDictBrandModelDto.getUnitType(),
+                unitDictBrandModelDto.getManufacture());
+    }
+
+    @Override
+    public boolean verifyUnitDictBrandModel(UnitDictBrandModelDto dto) {
+        Example queryExample = new Example(UnitDictBrandModelPO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        criteria.andEqualTo("unitType", dto.getUnitType());
+        criteria.andEqualTo("manufacture", dto.getManufacture());
+        criteria.andEqualTo("modelNumber", dto.getModelNumber());
+        int count = unitDictBrandModelMapper.selectCountByExample(queryExample);
+        return count > 0 ? true : false;
     }
 
 

energy-manage-service/src/main/java/com/energy/manage/service/service/units/impl/UnitServiceImpl.java

@@ -0,0 +1,66 @@
+package com.energy.manage.service.service.units.impl;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import com.energy.manage.common.base.BaseServiceImpl;
+import com.energy.manage.common.base.Page;
+import com.energy.manage.common.constant.redis.ManagerRedisKeyConstant;
+import com.energy.manage.common.enums.DeleteStatusEnum;
+import com.energy.manage.common.enums.IdPrefixEnum;
+import com.energy.manage.common.po.units.UnitDictBrandModelPO;
+import com.energy.manage.common.po.units.UnitDictConstantsPO;
+import com.energy.manage.common.util.IdGeneratorUtil;
+import com.energy.manage.service.domain.dto.units.*;
+import com.energy.manage.service.domain.vo.units.UnitDictBrandModelVo;
+import com.energy.manage.service.domain.vo.units.UnitDictConstantsVo;
+import com.energy.manage.service.domain.vo.units.UnitDictRoutineListVo;
+import com.energy.manage.service.mappers.units.UnitDictBrandModelMapper;
+import com.energy.manage.service.mappers.units.UnitDictConstantsMapper;
+import com.energy.manage.service.service.cache.CacheService;
+import com.energy.manage.service.service.dict.DictConstantsService;
+import com.energy.manage.service.service.units.UnitDictConstantsService;
+import com.energy.manage.service.service.units.UnitService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 部件字典表接口
+ */
+@Slf4j
+@Service
+public class UnitServiceImpl implements UnitService {
+
+    @Autowired
+    private UnitDictConstantsService unitDictConstantsService;
+
+
+    @Override
+    public List<UnitDictRoutineListVo> getUnitDictRoutineList(UnitDictRoutineDto unitDictRoutineDto) {
+        List<UnitDictConstantsVo> unitDictConstantsVos = unitDictConstantsService.getUnitDictConstantsList(unitDictRoutineDto.getContentsType());
+        UnitDictRoutineListVo vo = null;
+        List<UnitDictRoutineListVo> listVos = Lists.newArrayList();
+        for(UnitDictConstantsVo dictConstantsVo : unitDictConstantsVos){
+            vo = new UnitDictRoutineListVo();
+            vo.setKeyId(dictConstantsVo.getContentsValue());
+            vo.setValueName(dictConstantsVo.getContentsName());
+            listVos.add(vo);
+        }
+        return listVos;
+    }
+
+
+    @Override
+    public List<String> getBrandModelNameOrModelNumber(UnitDictBrandModelDto unitDictBrandModelDto) {
+        return unitDictConstantsService.getUnitDictBrandModelList(unitDictBrandModelDto);
+    }
+}

energy-manage-service/src/main/resources/mybatis/units/UnitBrandModelMapper.xml

@@ -0,0 +1,28 @@
+<?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.energy.manage.service.mappers.units.UnitDictBrandModelMapper">
+
+
+    <select id="selectUnitManufactureByUnitType" resultType="java.lang.String">
+        select manufacture from unit_dict_brand_model where unit_type = #{unitType}  group by manufacture
+    </select>
+
+    <select id="selectUnitModelNumberByManufacture" resultType="java.lang.String">
+
+         select
+            model_number as modelNumber
+         from
+            unit_dict_brand_model
+         where
+            unit_type = #{unitType}
+         and
+            manufacture = #{manufacture}
+         group by model_number
+
+    </select>
+
+
+
+
+
+</mapper>