feats

src/main/java/com/njyunzhi/nanyang/controller/CommController.java

@@ -16,7 +16,7 @@ import java.util.Map;
 
 //@Api(tags = "通用")
 @RestController
-@RequestMapping("/{client}")
+@RequestMapping("/")
 public class CommController extends BaseController {
 
     @Autowired
@@ -32,8 +32,7 @@ public class CommController extends BaseController {
      */
 //    @ApiOperation(value = "图片上传", notes = "图片上传")
     @PostMapping("/image")
-    public ResponseBean uploadImage(@PathVariable String client,
-                                    @RequestParam("file") MultipartFile multipartFile) {
+    public ResponseBean uploadImage(@RequestParam("file") MultipartFile multipartFile) {
         try {
             String img = ossUtils.putObject(multipartFile);
             return ResponseBean.success(img);
@@ -49,8 +48,7 @@ public class CommController extends BaseController {
      */
 //    @ApiOperation(value = "base64 图片上传", notes = "base64 图片上传")
     @PostMapping("/image/base64")
-    public ResponseBean uploadBase64Image(@PathVariable String client,
-                                          @RequestBody Map<String, String> data) {
+    public ResponseBean uploadBase64Image(@RequestBody Map<String, String> data) {
         try {
             String base64Str = data.get("base64");
             String img = ossUtils.putObject(base64Str);
@@ -66,7 +64,7 @@ public class CommController extends BaseController {
      */
 //    @ApiOperation(value = "获取文件上传凭证", notes = "获取文件上传凭证")
     @GetMapping("/oss-sts")
-    public ResponseBean getOSSSTS(@PathVariable String client) {
+    public ResponseBean getOSSSTS() {
         AliyunConfig.Oss oss = aliyunConfig.getOss();
 
         try {

src/main/java/com/njyunzhi/nanyang/controller/TcBindController.java

@@ -65,6 +65,17 @@ public class TcBindController extends BaseController {
 //    @ApiOperation("新增数据")
     @PostMapping("/tcBind")
     public ResponseBean add(@RequestBody TcBind tcBind) throws Exception {
+
+        QueryWrapper<TcBind> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("device_type", tcBind.getDeviceType());
+        queryWrapper.eq("device_no", tcBind.getDeviceNo());
+        List<TcBind> list = tcBindService.list(queryWrapper);
+        if (list != null && list.size() > 0) {
+            return ResponseBean.error(String.format("设备 【%s】 已录入", tcBind.getDeviceNo()));
+        }
+
+        tcBind.setSerialNo(null);
+        tcBind.setStatus(0);
         tcBindService.save(tcBind);
         return ResponseBean.success(tcBind);
     }
@@ -92,6 +103,12 @@ public class TcBindController extends BaseController {
 //    @ApiOperation("通过主键删除数据")
     @DeleteMapping("/tcBind/{id}")
     public ResponseBean deleteById(@PathVariable Integer id){
+
+        TcBind origin = tcBindService.getById(id);
+        if (origin.getStatus() == 1) {
+            return ResponseBean.error("当前设备已入库");
+        }
+
         tcBindService.removeLogicById(id);
         return ResponseBean.success("success");
     }

src/main/resources/application.yml

@@ -1,5 +1,7 @@
 server:
   port: 7083
+  servlet:
+    context-path: /api
 
 spring:
   datasource: