feats

db/.back_文明创办/文明创办-backup-202323151753.pdma.json → db/.back_文明创办/文明创办-backup-202326113238.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-2-3 14:29:50",
+  "updatedTime": "2023-2-5 10:46:48",
   "dbConns": [],
   "profile": {
     "default": {
@@ -3640,6 +3640,23 @@
           "notes": {},
           "id": "67B51317-2D33-4118-81AA-50D179CDF9E8"
         },
+        {
+          "defKey": "end_date",
+          "defName": "办结日期",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+          "id": "82C054A9-86DD-4905-B241-92C1467C68A4"
+        },
         {
           "defKey": "org_id",
           "defName": "责任单位",
@@ -6845,6 +6862,40 @@
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
           "id": "31758145-9BDD-4A20-904B-E70372F394E1"
         },
+        {
+          "defKey": "sex",
+          "defName": "性别",
+          "comment": "",
+          "type": "VARCHAR",
+          "len": 32,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "18C56DEF-A828-486A-941B-A4167F5AB0BE"
+        },
+        {
+          "defKey": "age",
+          "defName": "年龄段",
+          "comment": "",
+          "type": "VARCHAR",
+          "len": 64,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "005ABCD0-A5E8-4F3B-87C9-3C90087A368F"
+        },
         {
           "defKey": "score",
           "defName": "得分",

db/文明创办.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-2-5 10:46:48",
+  "updatedTime": "2023-2-6 11:32:38",
   "dbConns": [],
   "profile": {
     "default": {
@@ -8645,6 +8645,40 @@
           "uiHint": "",
           "id": "219A66C3-6D3F-4F1E-A572-9E5294556142"
         },
+        {
+          "defKey": "loc_id",
+          "defName": "点位ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "B93801A5-158E-41EC-9CC9-F2E586414C2A"
+        },
+        {
+          "defKey": "loc_name",
+          "defName": "点位名称",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+          "id": "49BF27B0-A3B7-4D25-8B62-871DC3C7D4C0"
+        },
         {
           "defKey": "content",
           "defName": "测评标准",

src/main/java/com/example/civilizedcity/controller/CommController.java

@@ -49,37 +49,37 @@ public class CommController extends BaseController {
     public ResponseBean uploadImage(@ApiParam("客户端") @PathVariable String client,
                                     @ApiParam("文件") @RequestParam("file") MultipartFile multipartFile,
                                     @ApiParam("文件类型") @RequestParam(value = "fileType", defaultValue = "image") String fileType) throws Exception {
-//        try {
-//            String url = ossUtils.putObject(multipartFile);
-//
-//            Map<String, Object> resp = new HashMap<>();
-//            resp.put("url", url);
-//            resp.put("fileType", fileType);
-//            return ResponseBean.success(resp);
-//        } catch (IOException e) {
-//            return ResponseBean.error("上传图片失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
-//        }
-
-
-        //获取文件名
-        String fileName = multipartFile.getOriginalFilename();
-        String newFileName = String.format("%s/%d-%s", getMonth(), System.currentTimeMillis(), fileName);
-
-        // 上传目录以日期分类
-        File tmp = new File(String.format("%s/%s", getUploadPath(), getMonth()));
-        if (!tmp.exists()) {
-            tmp.mkdir();
+        try {
+            String url = ossUtils.putObject(multipartFile);
+
+            Map<String, Object> resp = new HashMap<>();
+            resp.put("url", url);
+            resp.put("fileType", fileType);
+            return ResponseBean.success(resp);
+        } catch (IOException e) {
+            return ResponseBean.error("上传图片失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
 
-        //
-        File upFile = new File(String.format("%s/%s", getUploadPath(), newFileName));
-        multipartFile.transferTo(upFile);
 
-        String url = String.format("%s/%s", uploadPrefix, newFileName);
-        return ResponseBean.success(new HashMap<String, Object>(){{
-            put("url", url);
-            put("fileType", fileType);
-        }});
+//        //获取文件名
+//        String fileName = multipartFile.getOriginalFilename();
+//        String newFileName = String.format("%s/%d-%s", getMonth(), System.currentTimeMillis(), fileName);
+//
+//        // 上传目录以日期分类
+//        File tmp = new File(String.format("%s/%s", getUploadPath(), getMonth()));
+//        if (!tmp.exists()) {
+//            tmp.mkdir();
+//        }
+//
+//        //
+//        File upFile = new File(String.format("%s/%s", getUploadPath(), newFileName));
+//        multipartFile.transferTo(upFile);
+//
+//        String url = String.format("%s/%s", uploadPrefix, newFileName);
+//        return ResponseBean.success(new HashMap<String, Object>(){{
+//            put("url", url);
+//            put("fileType", fileType);
+//        }});
     }
 
     private String getUploadPath() {

src/main/java/com/example/civilizedcity/controller/TaCheckStandController.java

@@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.BaseController;
+import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.ResponseBean;
+
 import java.util.List;
+
+import com.example.civilizedcity.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -14,8 +18,9 @@ import org.springframework.web.bind.annotation.*;
 import com.example.civilizedcity.entity.TaCheckStand;
 import com.example.civilizedcity.service.TaCheckStandService;
 
- /**
+/**
  * 测评标准;(ta_check_stand)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2023-1-29
  */
@@ -23,12 +28,12 @@ import com.example.civilizedcity.service.TaCheckStandService;
 @RestController
 @RequestMapping("/")
 public class TaCheckStandController extends BaseController {
-    
+
     @Autowired
     private TaCheckStandService taCheckStandService;
-    
-    /** 
-     * 通过ID查询单条数据 
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param statndId 主键
      * @return 实例对象
@@ -38,41 +43,44 @@ public class TaCheckStandController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
         return ResponseBean.success(taCheckStandService.getById(id));
     }
-    
-//    /**
-//     * 分页查询
-//     *
-//     * @param pageNum 当前页码
-//     * @param pageSize 每页条数
-//     * @return 查询结果
-//     */
-//    @ApiOperation("分页查询")
-//    @GetMapping("/taCheckStand")
-//    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-//                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
-//
-//        IPage<TaCheckStand> pg = new Page<>(pageNum, pageSize);
-//        // QueryWrapper<TaCheckStand> queryWrapper = new QueryWrapper<>();
-//        // queryWrapper.orderByDesc("create_date");
-//        IPage<TaCheckStand> result = taCheckStandService.page(pg);
-//
-//        return ResponseBean.success(result);
-//    }
-//
-//    /**
-//     * 新增数据
-//     *
-//     * @param taCheckStand 实例对象
-//     * @return 实例对象
-//     */
-//    @ApiOperation("新增数据")
-//    @PostMapping("/taCheckStand")
-//    public ResponseBean add(@ApiParam("对象实体") @RequestBody TaCheckStand taCheckStand) throws Exception {
-//        taCheckStandService.save(taCheckStand);
-//        return ResponseBean.success(taCheckStand);
-//    }
-    
-    /** 
+
+    /**
+     * 分页查询
+     *
+     * @param pageNum  当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @ApiOperation("分页查询")
+    @GetMapping("/taCheckStand")
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                             @ApiParam("点位ID") @RequestParam(value = "locId", required = false) String locId) throws Exception {
+
+        IPage<TaCheckStand> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaCheckStand> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotEmpty(locId), "loc_id", locId);
+        queryWrapper.eq("status", Constants.STATUS_NORMAL);
+        queryWrapper.orderByDesc("create_date");
+        IPage<TaCheckStand> result = taCheckStandService.page(pg);
+
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param taCheckStand 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("新增数据")
+    @PostMapping("/taCheckStand")
+    public ResponseBean add(@ApiParam("对象实体") @RequestBody TaCheckStand taCheckStand) throws Exception {
+        taCheckStandService.save(taCheckStand);
+        return ResponseBean.success(taCheckStand);
+    }
+
+    /**
      * 更新数据
      *
      * @param taCheckStand 实例对象
@@ -81,7 +89,7 @@ public class TaCheckStandController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/taCheckStand/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaCheckStand taCheckStand,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+                             @ApiParam("对象ID") @PathVariable String id) throws Exception {
         taCheckStand.setStatndId(id);
         taCheckStandService.updateById(taCheckStand);
         return ResponseBean.success(taCheckStand);

src/main/java/com/example/civilizedcity/entity/TaCheckStand.java

@@ -26,9 +26,15 @@ public class TaCheckStand implements Serializable,Cloneable{
     @ApiModelProperty(name = "标准ID",notes = "")
     @TableId(value = "statnd_id", type = IdType.ASSIGN_UUID)
     private String statndId ;
-    /** 测评标准 */
-    @ApiModelProperty(name = "测评标准",notes = "")
-    private String content ;
+     /** 点位ID */
+     @ApiModelProperty(name = "点位ID",notes = "")
+     private String locId ;
+     /** 点位名称 */
+     @ApiModelProperty(name = "点位名称",notes = "")
+     private String locName ;
+     /** 测评标准 */
+     @ApiModelProperty(name = "测评标准",notes = "")
+     private String content ;
     /** 状态 */
     @ApiModelProperty(name = "状态",notes = "")
     private Integer status ;