5.24添加区域

src/main/java/com/example/tdl/domain/vo/ResultRegionVo.java

+package com.example.tdl.domain.vo;
+
+public class ResultRegionVo {
+    private String regionNo;
+
+    private String regionName;
+
+    private String companyName;
+
+    private String remark;
+
+    public String getRegionNo() {
+        return regionNo;
+    }
+
+    public void setRegionNo(String regionNo) {
+        this.regionNo = regionNo;
+    }
+
+    public String getRegionName() {
+        return regionName;
+    }
+
+    public void setRegionName(String regionName) {
+        this.regionName = regionName;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}

src/main/java/com/example/tdl/domain/vo/UpdateRegionVo.java

+package com.example.tdl.domain.vo;
+
+public class UpdateRegionVo {
+    private String regionNo;
+
+    private String regionName;
+
+    private String companyName;
+
+    private String remark;
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getRegionNo() {
+        return regionNo;
+    }
+
+    public void setRegionNo(String regionNo) {
+        this.regionNo = regionNo;
+    }
+
+    public String getRegionName() {
+        return regionName;
+    }
+
+    public void setRegionName(String regionName) {
+        this.regionName = regionName;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}

src/main/java/com/example/tdl/entity/Region.java

+package com.example.tdl.entity;
+
+public class Region {
+    private Integer id;
+
+    private String regionNo;
+
+    private String regionName;
+
+    private String lng;
+
+    private String lat;
+
+    private Integer company_id;
+
+    private String remark;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getRegionNo() {
+        return regionNo;
+    }
+
+    public void setRegionNo(String regionNo) {
+        this.regionNo = regionNo;
+    }
+
+    public String getRegionName() {
+        return regionName;
+    }
+
+    public void setRegionName(String regionName) {
+        this.regionName = regionName;
+    }
+
+    public String getLng() {
+        return lng;
+    }
+
+    public void setLng(String lng) {
+        this.lng = lng;
+    }
+
+    public String getLat() {
+        return lat;
+    }
+
+    public void setLat(String lat) {
+        this.lat = lat;
+    }
+
+    public Integer getCompany_id() {
+        return company_id;
+    }
+
+    public void setCompany_id(Integer company_id) {
+        this.company_id = company_id;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}

src/main/java/com/example/tdl/mapper/RegionMapper.java

+package com.example.tdl.mapper;
+
+
+import com.example.tdl.domain.vo.*;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface RegionMapper {
+    List<ResultRegionVo> getAll(String companyName);
+
+    ResultRegionVo getByRegionName(@Param("companyName") String companyName, @Param("regionName") String regionName);
+
+    ResultRegionVo getByRegionNo(@Param("companyName") String companyName, @Param("regionNo") String regionNo);
+
+    int addRegion(ResultRegionVo resultRegionVo);
+
+    int updateRegion(UpdateRegionVo updateRegionVo);
+
+    int deleteRegion(String regionNo);
+
+    Integer getByRegion(String regionNo);
+}

src/main/java/com/example/tdl/mapper/WarehouseMapper.java

@@ -26,4 +26,6 @@ public interface WarehouseMapper {
     ResultWarehouseVo getByWarehouseName(String warehouseName);
 
     List<ResultWarehouseVo> getByAlarm(DelAlarmVo delAlarmVo);
+
+
 }

src/main/java/com/example/tdl/service/RegionService.java

+package com.example.tdl.service;
+
+
+import com.example.tdl.domain.vo.*;
+import com.example.tdl.mapper.RegionMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+public class RegionService {
+    @Autowired
+    private RegionMapper regionMapper;
+
+    public List<ResultRegionVo> getAll(String companyName){
+        return regionMapper.getAll(companyName);
+    }
+
+    public ResultRegionVo getByRegionName(String companyName,String regionName){
+        return regionMapper.getByRegionName(companyName,regionName);
+    }
+
+    public ResultRegionVo getByRegionNo(String companyName,String regionNo){
+        return regionMapper.getByRegionNo(companyName,regionNo);
+    }
+
+    public int addRegion(ResultRegionVo resultRegionVo){
+        return regionMapper.addRegion(resultRegionVo);
+    }
+
+    public int updateRegion(UpdateRegionVo updateRegionVo){
+        return regionMapper.updateRegion(updateRegionVo);
+    }
+
+    public int deleteRegion(String regionNo){
+        return regionMapper.deleteRegion(regionNo);
+    }
+
+    public Integer getByRegion(String regionNo){
+        return regionMapper.getByRegion(regionNo);
+    }
+
+
+}

src/main/java/com/example/tdl/service/WarehouseService.java

@@ -45,4 +45,5 @@ public class WarehouseService {
         return warehouseMapper.getByAlarm(delAlarmVo);
     }
 
+
 }

src/main/java/com/example/tdl/web/GatewayController.java

@@ -147,7 +147,7 @@ public class GatewayController {
             "   name:网关名字，" +
             "   SN:需要修改的网关序列号，" +
             "   type:需要修改的网关类型," +
-            "   modelName:需要就传，不需要就不传。")
+            "   modelName:需要就传，不需要就不传")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
     })

src/main/java/com/example/tdl/web/RegionController.java

+package com.example.tdl.web;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.example.tdl.domain.dto.CommFeedback;
+import com.example.tdl.domain.vo.*;
+import com.example.tdl.service.RegionService;
+import com.example.tdl.service.WarehouseService;
+import com.example.tdl.service.redis.TokenRedisService;
+import com.google.gson.Gson;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+
+@RestController
+@RequestMapping("/region")
+public class RegionController {
+
+    private Logger logger = LoggerFactory.getLogger(RegionController.class);
+
+    private WarehouseService warehouseService=new WarehouseService();
+
+    CommFeedback fb=new CommFeedback();
+
+    Gson gson=new Gson();
+
+    @Autowired
+    private RegionService regionService=new RegionService();
+
+    @Autowired
+    private TokenRedisService tokenRedisService;
+
+    @Autowired
+    private I18nController i18n;
+
+    //查询所有预警信息
+    @ApiOperation(value = "查询所有区域信息",notes = "查询所有区域信息,返回值说明：" +
+            "   regionNo：区域编号，" +
+            "   regionName：区域名，" +
+            "   companyName：所属公司，" +
+            "   remark：备注")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+            @ApiImplicitParam(paramType="header", name = "AccountLanguage", value = "language", required = false, dataType = "String"),
+    })
+    @RequestMapping(value="/getAll",method = RequestMethod.GET)
+    public Object getAll(HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
+        return regionService.getAll(user.getCompanyName());
+    }
+
+    //添加区域信息
+    @ApiOperation(value = "添加区域信息",notes = "添加预警信息,regionNo,companyName不用传，需要传递参数：" +
+            "   regionName：区域名，" +
+            "   remark：备注")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+            @ApiImplicitParam(paramType="header", name = "AccountLanguage", value = "language", required = false, dataType = "String"),
+    })
+    @RequestMapping(value="/addRegion",method = RequestMethod.POST)
+    public Object addRegion(@RequestBody ResultRegionVo regionVo, HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
+
+        if (StringUtils.isEmpty(regionVo.getRegionName())){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"regionName"));
+            return gson.toJson(fb);
+        }
+        if(regionService.getByRegionName(user.getCompanyName(),regionVo.getRegionName())!=null){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"repetitionRegionName"));
+            return gson.toJson(fb);
+        }
+        regionVo.setRegionNo("RG"+System.currentTimeMillis());
+        regionVo.setCompanyName(user.getCompanyName());
+        int a=regionService.addRegion(regionVo);
+        if (a>0){
+            fb.setCode(1);
+            fb.setMessage(i18n.getMessage(request,"addRegionSuccess"));
+        }else{
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"addRegionFailure"));
+        }
+        return gson.toJson(fb);
+    }
+
+    //修改区域信息
+    @ApiOperation(value = "修改区域信息",notes = "修改区域信息,companyName不用传，需要传递参数：" +
+            "   regionNo：需要修改的区域编号，" +
+            "   regionName：修改后的区域名，" +
+            "   remark：修改后的备注")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+            @ApiImplicitParam(paramType="header", name = "AccountLanguage", value = "language", required = false, dataType = "String"),
+    })
+    @RequestMapping(value="/updateRegion",method = RequestMethod.POST)
+    public Object updateRegion(@RequestBody UpdateRegionVo updateRegionVo,HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
+//        String port = request.getHeader("AccountLanguage");
+        if (StringUtils.isEmpty(updateRegionVo.getRegionNo())){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"regionNo"));
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateRegionVo.getRegionName())){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"regionName"));
+            return gson.toJson(fb);
+        }
+        if(regionService.getByRegionName(user.getCompanyName(),updateRegionVo.getRegionName())!=null&&!regionService.getByRegionNo(user.getCompanyName(),updateRegionVo.getRegionNo()).getRegionName().equals(updateRegionVo.getRegionName())){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"repetitionRegionName"));
+            return gson.toJson(fb);
+        }
+        updateRegionVo.setCompanyName(user.getCompanyName());
+        int a=regionService.updateRegion(updateRegionVo);
+        if (a>0){
+            fb.setCode(1);
+            fb.setMessage(i18n.getMessage(request,"updateRegionSuccess"));
+        }else{
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"updateRegionFailure"));
+        }
+        return gson.toJson(fb);
+
+    }
+
+    //删除区域信息
+    @ApiOperation(value = "删除区域信息",notes = "删除区域信息,companyName不用传，传值说明：" +
+            "   regionNo：需要删除的区域编号" )
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+            @ApiImplicitParam(paramType="header", name = "AccountLanguage", value = "language", required = false, dataType = "String"),
+    })
+    @RequestMapping(value="/deleteRegion",method = RequestMethod.POST)
+    public Object deleteRegion(@RequestBody String regionNo,HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
+        JSONObject jsonObject= JSON.parseObject(regionNo);
+        regionNo=jsonObject.getString("regionNo");
+
+        if (StringUtils.isEmpty(regionNo)){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"regionNo"));
+            return gson.toJson(fb);
+        }
+        if (regionService.getByRegion(regionNo)>0){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"useingRegion"));
+            return gson.toJson(fb);
+        }
+        int a=regionService.deleteRegion(regionNo);
+        if (a>0){
+            fb.setCode(1);
+            fb.setMessage(i18n.getMessage(request,"deleteRegionSuccess"));
+        }else{
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"deleteRegionFailure"));
+        }
+        return gson.toJson(fb);
+    }
+
+}

src/main/resources/i18n/messages_zh_CN.properties

@@ -166,4 +166,14 @@ illegal = \u8BF7\u6C42\u53C2\u6570\u7C7B\u578B\u4E0D\u5339\u914D
 sql = \u6570\u636E\u5E93\u8BBF\u95EE\u5F02\u5E38
 badSql = \u6570\u636E\u5F02\u5E38
 error = \u670D\u52A1\u5668\u4EE3\u7801\u53D1\u751F\u5F02\u5E38,\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
-
+#\u533A\u57DF
+regionNo=\u533A\u57DF\u7F16\u53F7\u4E0D\u80FD\u4E3A\u7A7A
+regionName=\u533A\u57DF\u540D\u4E0D\u80FD\u4E3A\u7A7A
+addRegionSuccess=\u6DFB\u52A0\u533A\u57DF\u6210\u529F
+addRegionFailure=\u6DFB\u52A0\u533A\u57DF\u5931\u8D25
+updateRegionSuccess=\u4FEE\u6539\u533A\u57DF\u6210\u529F
+updateRegionFailure=\u4FEE\u6539\u533A\u57DF\u5931\u8D25
+deleteRegionSuccess=\u5220\u9664\u533A\u57DF\u6210\u529F
+deleteRegionFailure=\u5220\u9664\u533A\u57DF\u5931\u8D25
+repetitionRegionName=\u533A\u57DF\u540D\u91CD\u590D
+useingRegion=\u533A\u57DF\u6B63\u5728\u4F7F\u7528\u4E2D

src/main/resources/mapper/RegionMapper.xml

+<?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.example.tdl.mapper.RegionMapper">
+    <!--查询所有区域信息-->
+    <select id="getAll" resultType="com.example.tdl.domain.vo.ResultRegionVo">
+        SELECT regionNo,regionName,companyName,remark
+        from region r INNER JOIN company c ON r.company_id=c.id
+        AND companyName=#{companyName,jdbcType=VARCHAR}
+    </select>
+
+    <!--通过区域名查询信息-->
+    <select id="getByRegionName" parameterType="String" resultType="com.example.tdl.domain.vo.ResultRegionVo">
+        SELECT regionNo,regionName,companyName,remark
+        from region r INNER JOIN company c ON r.company_id=c.id
+        AND regionName=#{regionName,jdbcType=VARCHAR}
+        AND companyName=#{companyName,jdbcType=VARCHAR}
+    </select>
+
+    <!--通过区域编号查询信息-->
+    <select id="getByRegionNo" parameterType="String" resultType="com.example.tdl.domain.vo.ResultRegionVo">
+        SELECT regionNo,regionName,companyName,remark
+        from region r INNER JOIN company c ON r.company_id=c.id
+        AND regionNo=#{regionNo,jdbcType=VARCHAR}
+        AND companyName=#{companyName,jdbcType=VARCHAR}
+    </select>
+
+    <!--添加区域-->
+    <insert id="addRegion" parameterType="com.example.tdl.domain.vo.ResultRegionVo">
+        INSERT IGNORE INTO region VALUES(
+            null,
+            #{regionNo,jdbcType=VARCHAR},
+            #{regionName,jdbcType=VARCHAR},
+            (SELECT id from company where companyName=#{companyName,jdbcType=VARCHAR}),
+            #{remark,jdbcType=VARCHAR}
+        );
+    </insert>
+
+    <!--修改区域-->
+    <update id="updateRegion" parameterType="com.example.tdl.domain.vo.UpdateRegionVo">
+        UPDATE region set
+        regionName=#{regionName,jdbcType=VARCHAR},
+        remark=#{remark,jdbcType=VARCHAR}
+        WHERE regionNo=#{regionNo,jdbcType=VARCHAR}
+    </update>
+
+    <delete id="deleteRegion" parameterType="String">
+        DELETE from region WHERE regionNo=#{regionNo,jdbcType=VARCHAR}
+    </delete>
+
+    <!--根据区域信息查询仓库信息-->
+    <select id="getByRegion" parameterType="String" resultType="java.lang.Integer">
+        SELECT COUNT(*) from warehouse
+        WHERE region_id=(SELECT id from region WHERE regionNo=#{regionNo,jdbcType=VARCHAR})
+    </select>
+
+</mapper>
\ No newline at end of file

src/main/resources/mapper/WarehouseMapper.xml

@@ -120,4 +120,6 @@
         AND a.alarmType=#{alarmType,jdbcType=VARCHAR}
         AND a.alarmScene=#{alarmScene,jdbcType=VARCHAR}
     </select>
+
+
 </mapper>
\ No newline at end of file

src/main/resources/mybatis-config.xml

@@ -53,5 +53,6 @@
         <mapper resource="mapper/TransferModelMapper.xml"/>
         <mapper resource="mapper/CircuitTransferMapper.xml"/>
         <mapper resource="mapper/CompanyMapper.xml"/>
+        <mapper resource="mapper/RegionMapper.xml"/>
     </mappers>
 </configuration>