添加分类

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/alarm/AlarmTypeDto.java

@@ -77,9 +77,9 @@ public class AlarmTypeDto {
     @JsonIgnore
     private String tenantId;
     /**
-     * 1启用 0禁用
+     * 1启用 2禁用
      */
-    @ApiModelProperty(value = "1启用 0禁用")
+    @ApiModelProperty(value = "1启用 2禁用")
     private Integer alarmStatus;
     @ApiModelProperty(value = "水表数目")
     private Integer numberOfWaterMeters;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/ProductCategoryMapper.java

@@ -1,6 +1,7 @@
 package com.zcxk.rmcp.core.dao;
 
 import com.zcxk.core.common.pojo.UserCondition;
+import com.zcxk.rmcp.api.dto.ProductVo;
 import com.zcxk.rmcp.api.vo.ProductCategoryVo;
 import com.zcxk.rmcp.core.entity.ProductCategory;
 import org.apache.ibatis.annotations.Mapper;
@@ -50,4 +51,7 @@ public interface ProductCategoryMapper {
     * @return java.util.List<com.zcxk.rmcp.api.vo.ProductCategoryVo>
     **/
     List<ProductCategoryVo> listProductCategory(@Param("userCondition") UserCondition userCondition);
+
+    List<ProductCategoryVo> queryList();
+
 }

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/ProductCategoryMapper.xml

@@ -143,4 +143,7 @@
     <include refid="permissionCondition"/>
     GROUP BY rc.id, rc.name
   </select>
+    <select id="queryList" resultType="com.zcxk.rmcp.api.vo.ProductCategoryVo">
+      select * from rmcp_product_category
+    </select>
 </mapper>

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/CommonController.java

@@ -4,6 +4,7 @@ import com.zcxk.core.common.pojo.AjaxMessage;
 import com.zcxk.rmcp.api.dto.ProductVo;
 import com.zcxk.rmcp.api.vo.AreaVo;
 import com.zcxk.rmcp.api.vo.OrgTreeVo;
+import com.zcxk.rmcp.api.vo.ProductCategoryVo;
 import com.zcxk.rmcp.core.dao.AreaMapper;
 import com.zcxk.rmcp.core.entity.Org;
 import com.zcxk.rmcp.web.service.OrgService;
@@ -66,5 +67,11 @@ public class CommonController {
         List<ProductVo> list = productService.getProductList(categoryId);
         return AjaxMessage.success(list);
     }
+    @GetMapping("getCategoryList")
+    @ApiOperation(value = "获取产品分类列表")
+    public AjaxMessage<List<ProductCategoryVo>> getCategoryList() {
+        List<ProductCategoryVo> list = productService.getCategoryList();
+        return AjaxMessage.success(list);
+    }
 
 }

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/ProductService.java

@@ -1,6 +1,7 @@
 package com.zcxk.rmcp.web.service;
 
 import com.zcxk.rmcp.api.dto.ProductVo;
+import com.zcxk.rmcp.api.vo.ProductCategoryVo;
 import com.zcxk.rmcp.core.entity.Product;
 
 import java.util.List;
@@ -23,4 +24,6 @@ public interface ProductService{
 
     List<ProductVo> getProductList(Integer categoryId);
 
+    List<ProductCategoryVo> getCategoryList();
+
 }

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/ProductServiceImpl.java

@@ -1,6 +1,8 @@
 package com.zcxk.rmcp.web.service.impl;
 
 import com.zcxk.rmcp.api.dto.ProductVo;
+import com.zcxk.rmcp.api.vo.ProductCategoryVo;
+import com.zcxk.rmcp.core.dao.ProductCategoryMapper;
 import com.zcxk.rmcp.web.service.ProductService;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
@@ -8,7 +10,6 @@ import com.zcxk.rmcp.core.dao.ProductMapper;
 import com.zcxk.rmcp.core.entity.Product;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import static com.google.common.collect.Lists.newArrayList;
 
@@ -22,6 +23,8 @@ public class ProductServiceImpl implements ProductService {
 
     @Resource
     private ProductMapper productMapper;
+    @Resource
+    private ProductCategoryMapper productCategoryMapper;
 
     @Override
     public int insertSelective(Product record) {
@@ -48,5 +51,10 @@ public class ProductServiceImpl implements ProductService {
         return productMapper.findList(categoryId);
     }
 
+    @Override
+    public List<ProductCategoryVo> getCategoryList() {
+        return productCategoryMapper.queryList();
+    }
+
 
 }