refactor(config): 更新配置文件并清理代码生成工具和配件管理模块

- 修改application.yml中的redis连接配置
- 更新application-dev.yml和application-prod.yml的数据源和redis配置
- 删除三个代码生成工具类（HouseGenerator、LoveGenerator、OaGenerator）
- 优化IdcardServiceImpl，添加日志记录及错误返回，避免null异常
- 调整OpenEquipmentController中身份证验证逻辑，增加空指针判断和错误提示
- PaymentController异步通知方法添加事务支持，避免重复处理支付订单
- 修正PaymentController中续期时间逻辑，避免重复加月
- 删除TowerAccessory相关的实体、控制器、Mapper接口及Mapper XML文件，清理配件管理模块代码

src/main/java/com/gxwebsoft/oa/service/impl/IdcardServiceImpl.java

@@ -7,6 +7,7 @@ import com.gxwebsoft.love.vo.idcheck.FrontRecognitionResult;
 import com.gxwebsoft.love.vo.idcheck.Response;
 import com.gxwebsoft.oa.service.IdcardService;
 import com.gxwebsoft.oa.vo.IdcardRespVO;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.util.EntityUtils;
@@ -16,6 +17,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
+@Slf4j
 @Service
 public class IdcardServiceImpl implements IdcardService {
     @Override
@@ -49,9 +51,12 @@ public class IdcardServiceImpl implements IdcardService {
             //获取response的body
             //System.out.println(EntityUtils.toString(response.getEntity()));
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("身份证OCR识别调用失败", e);
-        }
+            // 返回一个含错误信息的对象，避免返回null导致上层的NullPointerException
-
+            IdcardRespVO errorResp = new IdcardRespVO();
-        return null;
+            errorResp.setCode("OCR_ERROR");
+            errorResp.setMessage("身份证识别服务暂不可用，请稍后重试");
+            return errorResp;
+        }
     }
 }

src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java

@@ -421,8 +421,9 @@ public class OpenEquipmentController extends BaseController {
 
             IdcardRespVO verify = idcardService.verify(front, back);
             System.out.println("verify res : " + verify);
-            if(!"FP00000".equals(verify.getCode())) {
+            if(verify == null || !"FP00000".equals(verify.getCode())) {
-                return fail("请上传身份证正面照片." + verify.getMessage() + verify.getCode());
+                String errMsg = verify != null ? verify.getMessage() + "(" + verify.getCode() + ")" : "身份证识别服务暂不可用";
+                return fail("身份证验证失败：" + errMsg);
             }
             if(verify.getIssueDate() == null || verify.getIssueOrg() == null || verify.getExpireDate() == null) {
                 return fail("请上传身份证反面照片");

src/main/java/com/gxwebsoft/shop/controller/PaymentController.java

@@ -326,6 +326,7 @@ public class PaymentController extends BaseController {
 
     @ApiModelProperty("异步通知")
     @OperationLog
+    @Transactional(rollbackFor = {Exception.class})
     @PostMapping("/mp-alipay/notify")
     public String alipayNotify(@RequestParam Map<String, String> params) throws AlipayApiException, ParseException {
         log.info("异步处理支付宝通知消息>>>>param:{}", params);
@@ -337,8 +338,10 @@ public class PaymentController extends BaseController {
         }
 
         Integer payStatus = order.getPayStatus();
+        // 如果已经处理成功，直接返回success让支付宝停止重试，避免BusinessException导致死循环重试
         if(payStatus >= PAY_STATUS_SUCCESS){
-            throw new BusinessException("订单已支付成功");
+            log.info("订单{}已支付成功，跳过重复处理", outTradeNo);
+            return "success";
         }
         final JSONObject config = alipayConfig.payment(order.getTenantId());
         // 生成环境证书路径
@@ -408,7 +411,8 @@ public class PaymentController extends BaseController {
 
             order.setCurrPeriods(parentOrder.getCurrPeriods());
             order.setBatteryRent(parentOrder.getBatteryRent());
-            order.setExpirationTime(DateUtil.offset(order.getExpirationTime(), DateField.MONTH, 1));
+            // expirationTime 已在 getByOrderId 中正确计算（+1月），此处无需再次加月
+            // 父订单的 expirationTime 已在上面同步（line 406: parentOrder.setExpirationTime(order.getExpirationTime())）
             orderPayService.updateById(order);
             orderService.updateById(parentOrder);
 

src/main/java/com/gxwebsoft/tower/controller/TowerAccessoryController.java

@@ -1,132 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.service.TowerAccessoryService;
-import com.gxwebsoft.tower.entity.TowerAccessory;
-import com.gxwebsoft.tower.param.TowerAccessoryParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 配件管理控制器
- *
- * @author 科技小王子
- * @since 2023-05-22 11:53:48
- */
-@Api(tags = "配件管理管理")
-@RestController
-@RequestMapping("/api/tower/tower-accessory")
-public class TowerAccessoryController extends BaseController {
-    @Resource
-    private TowerAccessoryService towerAccessoryService;
-
-    @PreAuthorize("hasAuthority('tower:towerAccessory:list')")
-    @OperationLog
-    @ApiOperation("分页查询配件管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerAccessory>> page(TowerAccessoryParam param) {
-        // 使用关联查询
-        return success(towerAccessoryService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerAccessory:list')")
-    @OperationLog
-    @ApiOperation("查询全部配件管理")
-    @GetMapping()
-    public ApiResult<List<TowerAccessory>> list(TowerAccessoryParam param) {
-        // 使用关联查询
-        return success(towerAccessoryService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerAccessory:list')")
-    @OperationLog
-    @ApiOperation("根据id查询配件管理")
-    @GetMapping("/{id}")
-    public ApiResult<TowerAccessory> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(towerAccessoryService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerAccessory:save')")
-    @OperationLog
-    @ApiOperation("添加配件管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerAccessory towerAccessory) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerAccessory.setUserId(loginUser.getUserId());
-        }
-        if (towerAccessoryService.save(towerAccessory)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerAccessory:update')")
-    @OperationLog
-    @ApiOperation("修改配件管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerAccessory towerAccessory) {
-        if (towerAccessoryService.updateById(towerAccessory)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerAccessory:remove')")
-    @OperationLog
-    @ApiOperation("删除配件管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerAccessoryService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerAccessory:save')")
-    @OperationLog
-    @ApiOperation("批量添加配件管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerAccessory> list) {
-        if (towerAccessoryService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerAccessory:update')")
-    @OperationLog
-    @ApiOperation("批量修改配件管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerAccessory> batchParam) {
-        if (batchParam.update(towerAccessoryService, "accessory_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerAccessory:remove')")
-    @OperationLog
-    @ApiOperation("批量删除配件管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerAccessoryService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}

src/main/java/com/gxwebsoft/tower/controller/TowerEquipmentController.java

@@ -1,141 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.TowerEquipment;
-import com.gxwebsoft.tower.param.TowerEquipmentParam;
-import com.gxwebsoft.tower.service.TowerEquipmentService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 塔吊设备管理控制器
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-@Api(tags = "塔吊设备管理管理")
-@RestController
-@RequestMapping("/api/tower/tower-equipment")
-public class TowerEquipmentController extends BaseController {
-    @Resource
-    private TowerEquipmentService towerEquipmentService;
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:list')")
-    @OperationLog
-    @ApiOperation("分页查询塔吊设备管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerEquipment>> page(TowerEquipmentParam param) {
-        // 使用关联查询
-        return success(towerEquipmentService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:list')")
-    @OperationLog
-    @ApiOperation("查询全部塔吊设备管理")
-    @GetMapping()
-    public ApiResult<List<TowerEquipment>> list(TowerEquipmentParam param) {
-        // 使用关联查询
-        return success(towerEquipmentService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:list')")
-    @OperationLog
-    @ApiOperation("根据id查询塔吊设备管理")
-    @GetMapping("/{id}")
-    public ApiResult<TowerEquipment> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(towerEquipmentService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:save')")
-    @OperationLog
-    @ApiOperation("添加塔吊设备管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerEquipment towerEquipment) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerEquipment.setUserId(loginUser.getUserId());
-        }
-        if (towerEquipmentService.save(towerEquipment)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:update')")
-    @OperationLog
-    @ApiOperation("修改塔吊设备管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerEquipment towerEquipment) {
-        if (towerEquipmentService.updateById(towerEquipment)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:remove')")
-    @OperationLog
-    @ApiOperation("删除塔吊设备管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerEquipmentService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:save')")
-    @OperationLog
-    @ApiOperation("批量添加塔吊设备管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerEquipment> list) {
-        if (towerEquipmentService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:update')")
-    @OperationLog
-    @ApiOperation("批量修改塔吊设备管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerEquipment> batchParam) {
-        if (batchParam.update(towerEquipmentService, "equipment_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:remove')")
-    @OperationLog
-    @ApiOperation("批量删除塔吊设备管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerEquipmentService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:update')")
-    @OperationLog
-    @ApiOperation("批量修改塔吊设备状态")
-    @PutMapping("/status")
-    public ApiResult<?> statusBatch(@RequestBody List<TowerEquipment> batchParam) {
-      if (towerEquipmentService.updateBatchById(batchParam)) {
-        return success("修改成功");
-      }
-      return fail("修改失败");
-    }
-}

src/main/java/com/gxwebsoft/tower/controller/TowerModelController.java

@@ -1,128 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.TowerModel;
-import com.gxwebsoft.tower.param.TowerModelParam;
-import com.gxwebsoft.tower.service.TowerModelService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 设备型号管理表控制器
- *
- * @author 科技小王子
- * @since 2023-05-29 14:07:46
- */
-@Api(tags = "设备型号管理表管理")
-@RestController
-@RequestMapping("/api/tower/tower-model")
-public class TowerModelController extends BaseController {
-    @Resource
-    private TowerModelService towerModelService;
-
-    @PreAuthorize("hasAuthority('tower:towerModel:list')")
-    @OperationLog
-    @ApiOperation("分页查询设备型号管理表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerModel>> page(TowerModelParam param) {
-        // 使用关联查询
-        return success(towerModelService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerModel:list')")
-    @OperationLog
-    @ApiOperation("查询全部设备型号管理表")
-    @GetMapping()
-    public ApiResult<List<TowerModel>> list(TowerModelParam param) {
-        // 使用关联查询
-        return success(towerModelService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerModel:list')")
-    @OperationLog
-    @ApiOperation("根据id查询设备型号管理表")
-    @GetMapping("/{id}")
-    public ApiResult<TowerModel> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(towerModelService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerModel:save')")
-    @OperationLog
-    @ApiOperation("添加设备型号管理表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerModel towerModel) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerModel.setUserId(loginUser.getUserId());
-        }
-        if (towerModelService.save(towerModel)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerModel:update')")
-    @OperationLog
-    @ApiOperation("修改设备型号管理表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerModel towerModel) {
-        if (towerModelService.updateById(towerModel)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerModel:remove')")
-    @OperationLog
-    @ApiOperation("删除设备型号管理表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerModelService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerModel:save')")
-    @OperationLog
-    @ApiOperation("批量添加设备型号管理表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerModel> list) {
-        if (towerModelService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerModel:update')")
-    @OperationLog
-    @ApiOperation("批量修改设备型号管理表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerModel> batchParam) {
-        if (batchParam.update(towerModelService, "category_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerModel:remove')")
-    @OperationLog
-    @ApiOperation("批量删除设备型号管理表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerModelService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}

src/main/java/com/gxwebsoft/tower/controller/TowerPlaceController.java

@@ -1,157 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.TowerPlace;
-import com.gxwebsoft.tower.entity.TowerPlaceStandard;
-import com.gxwebsoft.tower.param.TowerPlaceParam;
-import com.gxwebsoft.tower.service.TowerPlaceService;
-import com.gxwebsoft.tower.service.TowerPlaceStandardService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 检查/保养部位记录表控制器
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-@Api(tags = "检查/保养部位记录表管理")
-@RestController
-@RequestMapping("/api/tower/tower-place")
-public class TowerPlaceController extends BaseController {
-    @Resource
-    private TowerPlaceService towerPlaceService;
-    @Resource
-    private TowerPlaceStandardService towerPlaceStandardService;
-
-    @PreAuthorize("hasAuthority('tower:towerPlace:list')")
-    @OperationLog
-    @ApiOperation("分页查询检查/保养部位记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerPlace>> page(TowerPlaceParam param) {
-        PageParam<TowerPlace, TowerPlaceParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerPlaceService.page(page, page.getWrapper()));
-        // 使用关联查询
-//        return success(towerPlaceService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlace:list')")
-    @OperationLog
-    @ApiOperation("查询全部检查/保养部位记录表")
-    @GetMapping()
-    public ApiResult<List<TowerPlace>> list(TowerPlaceParam param) {
-        PageParam<TowerPlace, TowerPlaceParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerPlaceService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerPlaceService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlace:list')")
-    @OperationLog
-    @ApiOperation("根据id查询检查/保养部位记录表")
-    @GetMapping("/{id}")
-    public ApiResult<TowerPlace> get(@PathVariable("id") Integer id) {
-        return success(towerPlaceService.getById(id));
-        // 使用关联查询
-        //return success(towerPlaceService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlace:save')")
-    @OperationLog
-    @ApiOperation("添加检查/保养部位记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerPlace towerPlace) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerPlace.setUserId(loginUser.getUserId());
-        }
-        if (towerPlaceService.save(towerPlace)) {
-            // 保存检查标准
-            if (!towerPlace.getStandard().isEmpty()) {
-              final List<TowerPlaceStandard> standards = towerPlace.getStandard();
-              standards.forEach(d->{
-                d.setPlaceId(towerPlace.getPlaceId());
-              });
-              towerPlaceStandardService.saveBatch(standards);
-            }
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlace:update')")
-    @OperationLog
-    @ApiOperation("修改检查/保养部位记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerPlace towerPlace) {
-        if (towerPlaceService.updateById(towerPlace)) {
-            // 更新检查标准
-            if (!towerPlace.getStandard().isEmpty()) {
-              final List<TowerPlaceStandard> standards = towerPlace.getStandard();
-              towerPlaceStandardService.saveOrUpdateBatch(standards);
-            }
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlace:remove')")
-    @OperationLog
-    @ApiOperation("删除检查/保养部位记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerPlaceService.removeById(id)) {
-            towerPlaceStandardService.remove(new LambdaQueryWrapper<TowerPlaceStandard>().eq(TowerPlaceStandard::getPlaceId,id));
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlace:save')")
-    @OperationLog
-    @ApiOperation("批量添加检查/保养部位记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerPlace> list) {
-        if (towerPlaceService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlace:update')")
-    @OperationLog
-    @ApiOperation("批量修改检查/保养部位记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerPlace> batchParam) {
-        if (batchParam.update(towerPlaceService, "place_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlace:remove')")
-    @OperationLog
-    @ApiOperation("批量删除检查/保养部位记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerPlaceService.removeByIds(ids)) {
-            for (Integer id: ids){
-              towerPlaceStandardService.remove(new LambdaQueryWrapper<TowerPlaceStandard>().eq(TowerPlaceStandard::getPlaceId,id));
-            }
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}

src/main/java/com/gxwebsoft/tower/controller/TowerPlaceSafetyController.java

@@ -1,135 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.TowerPlaceSafety;
-import com.gxwebsoft.tower.param.TowerPlaceSafetyParam;
-import com.gxwebsoft.tower.service.TowerPlaceSafetyService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 安全巡检部位管理表控制器
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-@Api(tags = "安全巡检部位管理表管理")
-@RestController
-@RequestMapping("/api/tower/tower-place-safety")
-public class TowerPlaceSafetyController extends BaseController {
-    @Resource
-    private TowerPlaceSafetyService towerPlaceSafetyService;
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceSafety:list')")
-    @OperationLog
-    @ApiOperation("分页查询安全巡检部位管理表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerPlaceSafety>> page(TowerPlaceSafetyParam param) {
-        PageParam<TowerPlaceSafety, TowerPlaceSafetyParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerPlaceSafetyService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(towerPlaceSafetyService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceSafety:list')")
-    @OperationLog
-    @ApiOperation("查询全部安全巡检部位管理表")
-    @GetMapping()
-    public ApiResult<List<TowerPlaceSafety>> list(TowerPlaceSafetyParam param) {
-        PageParam<TowerPlaceSafety, TowerPlaceSafetyParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerPlaceSafetyService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerPlaceSafetyService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceSafety:list')")
-    @OperationLog
-    @ApiOperation("根据id查询安全巡检部位管理表")
-    @GetMapping("/{id}")
-    public ApiResult<TowerPlaceSafety> get(@PathVariable("id") Integer id) {
-        return success(towerPlaceSafetyService.getById(id));
-        // 使用关联查询
-        //return success(towerPlaceSafetyService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceSafety:save')")
-    @OperationLog
-    @ApiOperation("添加安全巡检部位管理表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerPlaceSafety towerPlaceSafety) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerPlaceSafety.setUserId(loginUser.getUserId());
-        }
-        if (towerPlaceSafetyService.save(towerPlaceSafety)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceSafety:update')")
-    @OperationLog
-    @ApiOperation("修改安全巡检部位管理表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerPlaceSafety towerPlaceSafety) {
-        if (towerPlaceSafetyService.updateById(towerPlaceSafety)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceSafety:remove')")
-    @OperationLog
-    @ApiOperation("删除安全巡检部位管理表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerPlaceSafetyService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceSafety:save')")
-    @OperationLog
-    @ApiOperation("批量添加安全巡检部位管理表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerPlaceSafety> list) {
-        if (towerPlaceSafetyService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceSafety:update')")
-    @OperationLog
-    @ApiOperation("批量修改安全巡检部位管理表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerPlaceSafety> batchParam) {
-        if (batchParam.update(towerPlaceSafetyService, "place_safety_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceSafety:remove')")
-    @OperationLog
-    @ApiOperation("批量删除安全巡检部位管理表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerPlaceSafetyService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}

src/main/java/com/gxwebsoft/tower/controller/TowerPlaceStandardController.java

@@ -1,129 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.tower.entity.TowerPlaceStandard;
-import com.gxwebsoft.tower.param.TowerPlaceStandardParam;
-import com.gxwebsoft.tower.service.TowerPlaceStandardService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 检查标准附件表控制器
- *
- * @author 科技小王子
- * @since 2023-06-08 15:37:00
- */
-@Api(tags = "检查标准附件表管理")
-@RestController
-@RequestMapping("/api/tower/tower-place-standard")
-public class TowerPlaceStandardController extends BaseController {
-    @Resource
-    private TowerPlaceStandardService towerPlaceStandardService;
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceStandard:list')")
-    @OperationLog
-    @ApiOperation("分页查询检查标准附件表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerPlaceStandard>> page(TowerPlaceStandardParam param) {
-        PageParam<TowerPlaceStandard, TowerPlaceStandardParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerPlaceStandardService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(towerPlaceStandardService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceStandard:list')")
-    @OperationLog
-    @ApiOperation("查询全部检查标准附件表")
-    @GetMapping()
-    public ApiResult<List<TowerPlaceStandard>> list(TowerPlaceStandardParam param) {
-        PageParam<TowerPlaceStandard, TowerPlaceStandardParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerPlaceStandardService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerPlaceStandardService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceStandard:list')")
-    @OperationLog
-    @ApiOperation("根据id查询检查标准附件表")
-    @GetMapping("/{id}")
-    public ApiResult<TowerPlaceStandard> get(@PathVariable("id") Integer id) {
-        return success(towerPlaceStandardService.getById(id));
-        // 使用关联查询
-        //return success(towerPlaceStandardService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceStandard:save')")
-    @OperationLog
-    @ApiOperation("添加检查标准附件表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerPlaceStandard towerPlaceStandard) {
-        if (towerPlaceStandardService.save(towerPlaceStandard)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceStandard:update')")
-    @OperationLog
-    @ApiOperation("修改检查标准附件表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerPlaceStandard towerPlaceStandard) {
-        if (towerPlaceStandardService.updateById(towerPlaceStandard)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceStandard:remove')")
-    @OperationLog
-    @ApiOperation("删除检查标准附件表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerPlaceStandardService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceStandard:save')")
-    @OperationLog
-    @ApiOperation("批量添加检查标准附件表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerPlaceStandard> list) {
-        if (towerPlaceStandardService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceStandard:update')")
-    @OperationLog
-    @ApiOperation("批量修改检查标准附件表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerPlaceStandard> batchParam) {
-        if (batchParam.update(towerPlaceStandardService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceStandard:remove')")
-    @OperationLog
-    @ApiOperation("批量删除检查标准附件表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerPlaceStandardService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}

src/main/java/com/gxwebsoft/tower/controller/TowerProjectController.java

@@ -1,180 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.TowerProject;
-import com.gxwebsoft.tower.entity.TowerProjectOrder;
-import com.gxwebsoft.tower.entity.TowerProjectPlace;
-import com.gxwebsoft.tower.entity.TowerProjectUser;
-import com.gxwebsoft.tower.param.TowerProjectParam;
-import com.gxwebsoft.tower.service.TowerProjectOrderService;
-import com.gxwebsoft.tower.service.TowerProjectPlaceService;
-import com.gxwebsoft.tower.service.TowerProjectService;
-import com.gxwebsoft.tower.service.TowerProjectUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Set;
-
-/**
- * 项目管理控制器
- *
- * @author 科技小王子
- * @since 2023-05-22 13:30:39
- */
-@Api(tags = "项目管理管理")
-@RestController
-@RequestMapping("/api/tower/tower-project")
-public class TowerProjectController extends BaseController {
-    @Resource
-    private TowerProjectService towerProjectService;
-    @Resource
-    private TowerProjectOrderService towerProjectOrderService;
-    @Resource
-    private TowerProjectUserService towerProjectUserService;
-    @Resource
-    private TowerProjectPlaceService towerProjectPlaceService;
-
-    @PreAuthorize("hasAuthority('tower:towerProject:list')")
-    @ApiOperation("分页查询项目管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerProject>> page(TowerProjectParam param) {
-        // 使用关联查询
-        return success(towerProjectService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProject:list')")
-    @ApiOperation("查询全部项目管理")
-    @GetMapping()
-    public ApiResult<List<TowerProject>> list(TowerProjectParam param) {
-        // 使用关联查询
-        return success(towerProjectService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProject:list')")
-    @ApiOperation("根据id查询项目管理")
-    @GetMapping("/{id}")
-    public ApiResult<TowerProject> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(towerProjectService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProject:save')")
-    @Transactional(rollbackFor = {Exception.class})
-    @ApiOperation("添加项目管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerProject towerProject) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerProject.setUserId(loginUser.getUserId());
-        }
-      System.out.println("towerProject = " + towerProject.getPlaces2());
-        if (towerProjectService.save(towerProject)) {
-          final Integer projectId = towerProject.getProjectId();
-            // 批量添加项目成员
-            if (!towerProject.getUsers().isEmpty()) {
-              final Set<TowerProjectUser> users = towerProject.getUsers();
-              users.forEach(d->{
-                d.setProjectId(projectId);
-              });
-              towerProjectUserService.saveBatch(users);
-            }
-            // 批量添加项目订单
-            if (!towerProject.getOrders().isEmpty()) {
-              final Set<TowerProjectOrder> orders = towerProject.getOrders();
-              orders.forEach(d->{
-                d.setProjectId(projectId);
-              });
-              towerProjectOrderService.saveBatch(orders);
-            }
-            // 批量添加检查部位配置
-            if (!towerProject.getPlaces1().isEmpty()) {
-              final Set<TowerProjectPlace> places1 = towerProject.getPlaces1();
-              places1.forEach(d->{
-                d.setProjectId(projectId);
-              });
-              towerProjectPlaceService.saveBatch(places1);
-            }
-            // 批量添加保养部位配置
-            if (!towerProject.getPlaces2().isEmpty()) {
-              final Set<TowerProjectPlace> places2 = towerProject.getPlaces2();
-              places2.forEach(d->{
-                d.setProjectId(projectId);
-              });
-              towerProjectPlaceService.saveBatch(places2);
-            }
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProject:update')")
-    @Transactional(rollbackFor = {Exception.class})
-    @ApiOperation("修改项目管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerProject towerProject) {
-        if (towerProjectService.updateById(towerProject)) {
-            // 批量修改项目成员
-            towerProjectUserService.saveOrUpdateBatch(towerProject.getUsers());
-            // 批量修改项目订单
-            towerProjectOrderService.saveOrUpdateBatch(towerProject.getOrders());
-            // 批量修改检查/保养部位配置
-            towerProjectPlaceService.saveOrUpdateBatch(towerProject.getPlaces1());
-            towerProjectPlaceService.saveOrUpdateBatch(towerProject.getPlaces2());
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProject:remove')")
-    @ApiOperation("删除项目管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerProjectService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProject:save')")
-    @ApiOperation("批量添加项目管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerProject> list) {
-        if (towerProjectService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProject:update')")
-    @ApiOperation("批量修改项目管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerProject> batchParam) {
-        if (batchParam.update(towerProjectService, "project_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProject:remove')")
-    @OperationLog
-    @ApiOperation("批量删除项目管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerProjectService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}

src/main/java/com/gxwebsoft/tower/controller/TowerProjectOrderController.java

@@ -1,128 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.TowerProjectOrder;
-import com.gxwebsoft.tower.param.TowerProjectOrderParam;
-import com.gxwebsoft.tower.service.TowerProjectOrderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 合同签订设备清单控制器
- *
- * @author 科技小王子
- * @since 2023-06-07 18:48:56
- */
-@Api(tags = "合同签订设备清单管理")
-@RestController
-@RequestMapping("/api/tower/tower-project-order")
-public class TowerProjectOrderController extends BaseController {
-    @Resource
-    private TowerProjectOrderService towerProjectOrderService;
-
-    @PreAuthorize("hasAuthority('tower:towerProjectOrder:list')")
-    @OperationLog
-    @ApiOperation("分页查询合同签订设备清单")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerProjectOrder>> page(TowerProjectOrderParam param) {
-        // 使用关联查询
-        return success(towerProjectOrderService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectOrder:list')")
-    @OperationLog
-    @ApiOperation("查询全部合同签订设备清单")
-    @GetMapping()
-    public ApiResult<List<TowerProjectOrder>> list(TowerProjectOrderParam param) {
-        // 使用关联查询
-        return success(towerProjectOrderService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectOrder:list')")
-    @OperationLog
-    @ApiOperation("根据id查询合同签订设备清单")
-    @GetMapping("/{id}")
-    public ApiResult<TowerProjectOrder> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(towerProjectOrderService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectOrder:save')")
-    @OperationLog
-    @ApiOperation("添加合同签订设备清单")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerProjectOrder towerProjectOrder) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerProjectOrder.setUserId(loginUser.getUserId());
-        }
-        if (towerProjectOrderService.save(towerProjectOrder)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectOrder:update')")
-    @OperationLog
-    @ApiOperation("修改合同签订设备清单")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerProjectOrder towerProjectOrder) {
-        if (towerProjectOrderService.updateById(towerProjectOrder)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectOrder:remove')")
-    @OperationLog
-    @ApiOperation("删除合同签订设备清单")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerProjectOrderService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectOrder:save')")
-    @OperationLog
-    @ApiOperation("批量添加合同签订设备清单")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerProjectOrder> list) {
-        if (towerProjectOrderService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectOrder:update')")
-    @OperationLog
-    @ApiOperation("批量修改合同签订设备清单")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerProjectOrder> batchParam) {
-        if (batchParam.update(towerProjectOrderService, "project_order_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectOrder:remove')")
-    @OperationLog
-    @ApiOperation("批量删除合同签订设备清单")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerProjectOrderService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}

src/main/java/com/gxwebsoft/tower/controller/TowerProjectPlaceController.java

@@ -1,130 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerProjectPlace;
-import com.gxwebsoft.tower.param.TowerProjectPlaceParam;
-import com.gxwebsoft.tower.service.TowerProjectPlaceService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 检查/保养部位配置表控制器
- *
- * @author 科技小王子
- * @since 2023-06-08 17:22:55
- */
-@Api(tags = "检查/保养部位配置表管理")
-@RestController
-@RequestMapping("/api/tower/tower-project-place")
-public class TowerProjectPlaceController extends BaseController {
-    @Resource
-    private TowerProjectPlaceService towerProjectPlaceService;
-
-    @PreAuthorize("hasAuthority('tower:towerProjectPlace:list')")
-    @OperationLog
-    @ApiOperation("分页查询检查/保养部位配置表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerProjectPlace>> page(TowerProjectPlaceParam param) {
-        // 使用关联查询
-        return success(towerProjectPlaceService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectPlace:list')")
-    @OperationLog
-    @ApiOperation("查询全部检查/保养部位配置表")
-    @GetMapping()
-    public ApiResult<List<TowerProjectPlace>> list(TowerProjectPlaceParam param) {
-        // 使用关联查询
-        return success(towerProjectPlaceService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectPlace:list')")
-    @OperationLog
-    @ApiOperation("根据id查询检查/保养部位配置表")
-    @GetMapping("/{id}")
-    public ApiResult<TowerProjectPlace> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(towerProjectPlaceService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectPlace:save')")
-    @OperationLog
-    @ApiOperation("添加检查/保养部位配置表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerProjectPlace towerProjectPlace) {
-      if (towerProjectPlaceService.count(new LambdaQueryWrapper<TowerProjectPlace>()
-        .eq(TowerProjectPlace::getProjectId, towerProjectPlace.getProjectId()).eq(TowerProjectPlace::getPlaceId,towerProjectPlace.getPlaceId())) > 0) {
-        return fail("该部位已存在");
-      }
-      if (towerProjectPlaceService.save(towerProjectPlace)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectPlace:update')")
-    @OperationLog
-    @ApiOperation("修改检查/保养部位配置表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerProjectPlace towerProjectPlace) {
-        if (towerProjectPlaceService.updateById(towerProjectPlace)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectPlace:remove')")
-    @OperationLog
-    @ApiOperation("删除检查/保养部位配置表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerProjectPlaceService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectPlace:save')")
-    @OperationLog
-    @ApiOperation("批量添加检查/保养部位配置表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerProjectPlace> list) {
-        if (towerProjectPlaceService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectPlace:update')")
-    @OperationLog
-    @ApiOperation("批量修改检查/保养部位配置表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerProjectPlace> batchParam) {
-        if (batchParam.update(towerProjectPlaceService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectPlace:remove')")
-    @OperationLog
-    @ApiOperation("批量删除检查/保养部位配置表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerProjectPlaceService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}

src/main/java/com/gxwebsoft/tower/controller/TowerProjectUserController.java

@@ -1,130 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerProjectUser;
-import com.gxwebsoft.tower.param.TowerProjectUserParam;
-import com.gxwebsoft.tower.service.TowerProjectUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 项目成员控制器
- *
- * @author 科技小王子
- * @since 2023-06-07 15:00:32
- */
-@Api(tags = "项目成员管理")
-@RestController
-@RequestMapping("/api/tower/tower-project-user")
-public class TowerProjectUserController extends BaseController {
-    @Resource
-    private TowerProjectUserService towerProjectUserService;
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:list')")
-    @OperationLog
-    @ApiOperation("分页查询项目成员")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerProjectUser>> page(TowerProjectUserParam param) {
-        // 使用关联查询
-        return success(towerProjectUserService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:list')")
-    @OperationLog
-    @ApiOperation("查询全部项目成员")
-    @GetMapping()
-    public ApiResult<List<TowerProjectUser>> list(TowerProjectUserParam param) {
-        // 使用关联查询
-        return success(towerProjectUserService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:list')")
-    @OperationLog
-    @ApiOperation("根据id查询项目成员")
-    @GetMapping("/{id}")
-    public ApiResult<TowerProjectUser> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(towerProjectUserService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:save')")
-    @OperationLog
-    @ApiOperation("添加项目成员")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerProjectUser towerProjectUser) {
-        if (towerProjectUserService.count(new LambdaQueryWrapper<TowerProjectUser>()
-          .eq(TowerProjectUser::getUserId, towerProjectUser.getUserId()).eq(TowerProjectUser::getProjectId,towerProjectUser.getProjectId())) > 0) {
-          return fail("该成员已存在");
-        }
-        if (towerProjectUserService.save(towerProjectUser)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:update')")
-    @OperationLog
-    @ApiOperation("修改项目成员")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerProjectUser towerProjectUser) {
-        if (towerProjectUserService.updateById(towerProjectUser)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:remove')")
-    @OperationLog
-    @ApiOperation("删除项目成员")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerProjectUserService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:save')")
-    @OperationLog
-    @ApiOperation("批量添加项目成员")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerProjectUser> list) {
-        if (towerProjectUserService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:update')")
-    @OperationLog
-    @ApiOperation("批量修改项目成员")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerProjectUser> batchParam) {
-        if (batchParam.update(towerProjectUserService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:remove')")
-    @OperationLog
-    @ApiOperation("批量删除项目成员")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerProjectUserService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}

src/main/java/com/gxwebsoft/tower/controller/TowerWarehouseController.java

@@ -1,132 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.service.TowerWarehouseService;
-import com.gxwebsoft.tower.entity.TowerWarehouse;
-import com.gxwebsoft.tower.param.TowerWarehouseParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 仓库管理控制器
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-@Api(tags = "仓库管理管理")
-@RestController
-@RequestMapping("/api/tower/tower-warehouse")
-public class TowerWarehouseController extends BaseController {
-    @Resource
-    private TowerWarehouseService towerWarehouseService;
-
-    @PreAuthorize("hasAuthority('tower:towerWarehouse:list')")
-    @OperationLog
-    @ApiOperation("分页查询仓库管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerWarehouse>> page(TowerWarehouseParam param) {
-        // 使用关联查询
-        return success(towerWarehouseService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWarehouse:list')")
-    @OperationLog
-    @ApiOperation("查询全部仓库管理")
-    @GetMapping()
-    public ApiResult<List<TowerWarehouse>> list(TowerWarehouseParam param) {
-        // 使用关联查询
-        return success(towerWarehouseService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWarehouse:list')")
-    @OperationLog
-    @ApiOperation("根据id查询仓库管理")
-    @GetMapping("/{id}")
-    public ApiResult<TowerWarehouse> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(towerWarehouseService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWarehouse:save')")
-    @OperationLog
-    @ApiOperation("添加仓库管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerWarehouse towerWarehouse) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerWarehouse.setUserId(loginUser.getUserId());
-        }
-        if (towerWarehouseService.save(towerWarehouse)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWarehouse:update')")
-    @OperationLog
-    @ApiOperation("修改仓库管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerWarehouse towerWarehouse) {
-        if (towerWarehouseService.updateById(towerWarehouse)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWarehouse:remove')")
-    @OperationLog
-    @ApiOperation("删除仓库管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerWarehouseService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWarehouse:save')")
-    @OperationLog
-    @ApiOperation("批量添加仓库管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerWarehouse> list) {
-        if (towerWarehouseService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWarehouse:update')")
-    @OperationLog
-    @ApiOperation("批量修改仓库管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerWarehouse> batchParam) {
-        if (batchParam.update(towerWarehouseService, "warehouse_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWarehouse:remove')")
-    @OperationLog
-    @ApiOperation("批量删除仓库管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerWarehouseService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}

src/main/java/com/gxwebsoft/tower/entity/TowerAccessory.java

@@ -1,110 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 配件管理
- *
- * @author 科技小王子
- * @since 2023-05-22 11:53:48
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerAccessory对象", description = "配件管理")
-public class TowerAccessory implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "accessory_id", type = IdType.AUTO)
-    private Integer accessoryId;
-
-    @ApiModelProperty(value = "配件名称")
-    private String accessoryName;
-
-    @ApiModelProperty(value = "配件编号")
-    private String accessoryNo;
-
-    @ApiModelProperty(value = "配件分类")
-    private String accessoryCategory;
-
-    @ApiModelProperty(value = "适用设备型号")
-    private String accessoryModel;
-
-    @ApiModelProperty(value = "适用设备型号(多选)")
-    private String accessoryModelMultiple;
-
-    @ApiModelProperty(value = "配件规格")
-    private String accessorySpecs;
-
-    @ApiModelProperty(value = "单价")
-    private BigDecimal accessoryPrice;
-
-    @ApiModelProperty(value = "配件单位")
-    private String accessoryUnit;
-
-    @ApiModelProperty(value = "重量")
-    private String accessoryWeight;
-
-    @ApiModelProperty(value = "库存总量")
-    private Integer accessoryStock;
-
-    @ApiModelProperty(value = "产权单位名称")
-    private String companyName;
-
-    @ApiModelProperty(value = "产权单位编号")
-    private String companyNo;
-
-    @ApiModelProperty(value = "制造厂商")
-    private String manufactor;
-
-    @ApiModelProperty(value = "制造厂商编号")
-    private String manufactorNo;
-
-    @ApiModelProperty(value = "使用年限")
-    private String lifeYear;
-
-    @ApiModelProperty(value = "出厂日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date factoryDate;
-
-    @ApiModelProperty(value = "报废日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date scrapDate;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "排序号")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}

src/main/java/com/gxwebsoft/tower/entity/TowerEquipment.java

@@ -1,160 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 塔吊设备管理
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerEquipment对象", description = "塔吊设备管理")
-public class TowerEquipment implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "equipment_id", type = IdType.AUTO)
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "设备名称")
-    private String name;
-
-    @ApiModelProperty(value = "设备型号")
-    private String model;
-
-    @ApiModelProperty(value = "设备编号")
-    private String equipmentNo;
-
-    @ApiModelProperty(value = "出厂编号")
-    private String factoryNo;
-
-    @ApiModelProperty(value = "出厂日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date factoryDate;
-
-    @ApiModelProperty(value = "制造厂商")
-    private String manufactor;
-
-    @ApiModelProperty(value = "使用年限")
-    private String lifeYear;
-
-    @ApiModelProperty(value = "报废日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date scrapDate;
-
-    @ApiModelProperty(value = "备案编号")
-    private String filingNo;
-
-    @ApiModelProperty(value = "机号")
-    private String machineNo;
-
-    @ApiModelProperty(value = "备案许可证号")
-    private String licenceNo;
-
-    @ApiModelProperty(value = "产权单位")
-    private String company;
-
-    @ApiModelProperty(value = "所属部门")
-    private String organization;
-
-    @ApiModelProperty(value = "所属仓库")
-    private String warehouse;
-
-    @ApiModelProperty(value = "设备来源")
-    private String source;
-
-    @ApiModelProperty(value = "采购日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date buyDate;
-
-    @ApiModelProperty(value = "当前位置")
-      private String currentLocation;
-
-    @ApiModelProperty(value = "设计高度")
-    private String designHeight;
-
-    @ApiModelProperty(value = "独立高度")
-    private String height;
-
-    @ApiModelProperty(value = "额定载重")
-    private String ratedLoad;
-
-    @ApiModelProperty(value = "最大幅度处额定载重")
-    private String maxRatedLoad;
-
-    @ApiModelProperty(value = "最大起升高度")
-    private String maxLiftingHeight;
-
-    @ApiModelProperty(value = "臂长")
-    private String armLength;
-
-    @ApiModelProperty(value = "附件1")
-    private String file1;
-
-    @ApiModelProperty(value = "附件2")
-    private String file2;
-
-    @ApiModelProperty(value = "附件3")
-    private String file3;
-
-    @ApiModelProperty(value = "附件4")
-    private String file4;
-
-    @ApiModelProperty(value = "附件5")
-    private String file5;
-
-    @ApiModelProperty(value = "附件6")
-    private String file6;
-
-    @ApiModelProperty(value = "附件7")
-    private String file7;
-
-    @ApiModelProperty(value = "当前位置")
-    private String address;
-
-    @ApiModelProperty(value = "是否外协标识")
-    @TableField(exist = false)
-    private Boolean isOutOrg;
-
-    @ApiModelProperty(value = "所属人员")
-    private String users;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}

src/main/java/com/gxwebsoft/tower/entity/TowerModel.java

@@ -1,70 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 设备型号管理表
- *
- * @author 科技小王子
- * @since 2023-05-29 14:07:46
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerModel对象", description = "设备型号管理表")
-public class TowerModel implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "型号ID")
-    @TableId(value = "model_id", type = IdType.AUTO)
-    private Integer modelId;
-
-    @ApiModelProperty(value = "设备名称")
-    private String name;
-
-    @ApiModelProperty(value = "设备型号")
-    private String model;
-
-    @ApiModelProperty(value = "上级分类ID")
-    private Integer parentId;
-
-    @ApiModelProperty(value = "分类图片")
-    private String image;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "使用年限")
-    private Integer yearLife;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}

src/main/java/com/gxwebsoft/tower/entity/TowerPlace.java

@@ -1,85 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 检查/保养部位记录表
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerPlace对象", description = "检查/保养部位记录表")
-public class TowerPlace implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "参数ID")
-    @TableId(value = "place_id", type = IdType.AUTO)
-    private Integer placeId;
-
-    @ApiModelProperty(value = "部位编码")
-    private String placeCode;
-
-    @ApiModelProperty(value = "设备类型")
-    private String equipmentType;
-
-    @ApiModelProperty(value = "部位名称")
-    private String name;
-
-    @ApiModelProperty(value = "检查/保养标准")
-    @TableField(exist = false)
-    private List<TowerPlaceStandard> standard;
-
-    @ApiModelProperty(value = "部位类型")
-    private String type;
-
-    @ApiModelProperty(value = "推送目标系统")
-    private String pushSystem;
-
-    @ApiModelProperty(value = "其它项目对应值")
-    private String otherParam;
-
-    @ApiModelProperty(value = "附件")
-    private String files;
-
-    @ApiModelProperty(value = "是否默认显示")
-    private Integer isShow;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}

src/main/java/com/gxwebsoft/tower/entity/TowerPlaceSafety.java

@@ -1,82 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 安全巡检部位管理表
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerPlaceSafety对象", description = "安全巡检部位管理表")
-public class TowerPlaceSafety implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "参数ID")
-    @TableId(value = "place_safety_id", type = IdType.AUTO)
-    private Integer placeSafetyId;
-
-    @ApiModelProperty(value = "部位编码")
-    private String placeCode;
-
-    @ApiModelProperty(value = "设备类型")
-    private String equipmentType;
-
-    @ApiModelProperty(value = "安全巡检部位名称")
-    private String name;
-
-    @ApiModelProperty(value = "检查标准")
-    private String checkStandard;
-
-    @ApiModelProperty(value = "部位类型")
-    private String type;
-
-    @ApiModelProperty(value = "推送目标系统")
-    private String pushSystem;
-
-    @ApiModelProperty(value = "其它项目对应值")
-    private String otherParam;
-
-    @ApiModelProperty(value = "附件")
-    private String files;
-
-    @ApiModelProperty(value = "是否默认显示")
-    private Integer isShow;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}

src/main/java/com/gxwebsoft/tower/entity/TowerPlaceStandard.java

@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 检查标准附件表
- *
- * @author 科技小王子
- * @since 2023-06-08 15:37:00
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerPlaceStandard对象", description = "检查标准附件表")
-public class TowerPlaceStandard implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "参数ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer placeId;
-
-    @ApiModelProperty(value = "检查标准")
-    private String standard;
-
-    @ApiModelProperty(value = "附件")
-    private String files;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-}

src/main/java/com/gxwebsoft/tower/entity/TowerProject.java

@@ -1,130 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Set;
-
-/**
- * 项目管理
- *
- * @author 科技小王子
- * @since 2023-05-22 13:30:39
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerProject对象", description = "项目管理")
-public class TowerProject implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "project_id", type = IdType.AUTO)
-    private Integer projectId;
-
-    @ApiModelProperty(value = "项目名称")
-    private String projectName;
-
-    @ApiModelProperty(value = "项目图片")
-    private String projectImage;
-
-    @ApiModelProperty(value = "租赁单位")
-    private String companyName;
-
-    @ApiModelProperty(value = "承租单位")
-    private String customerName;
-
-    @ApiModelProperty(value = "项目地址")
-    private String projectRegion;
-
-    @ApiModelProperty(value = "详细地址")
-    private String projectAddress;
-
-    @ApiModelProperty(value = "经度")
-    private String longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private String latitude;
-
-    @ApiModelProperty(value = "报监编号")
-    private String superviseNo;
-
-    @ApiModelProperty(value = "施工许可证")
-    private String licenceNo;
-
-    @ApiModelProperty(value = "安全状态")
-    private String securityStatus;
-
-    @ApiModelProperty(value = "主管部门")
-    private String competentDepartment;
-
-    @ApiModelProperty(value = "安拆单位")
-    private String dismantlingCompany;
-
-    @ApiModelProperty(value = "汽吊规格")
-    private String truckCraneSpecs;
-
-    @ApiModelProperty(value = "合同其他说明")
-    private String contract;
-
-    @ApiModelProperty(value = "项目负责人")
-    private String director;
-
-    @ApiModelProperty(value = "项目经理")
-    private String projectDirector;
-
-    @ApiModelProperty(value = "项目状态")
-    private String projectStatus;
-
-    @ApiModelProperty(value = "业务员")
-    private String salesman;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "排序号")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "项目成员")
-    @TableField(exist = false)
-    private Set<TowerProjectUser> users;
-
-    @ApiModelProperty(value = "合同预定设备清单")
-    @TableField(exist = false)
-    private Set<TowerProjectOrder> orders;
-
-    @ApiModelProperty(value = "检查部位配置")
-    @TableField(exist = false)
-    private Set<TowerProjectPlace> places1;
-
-    @ApiModelProperty(value = "保养部位配置")
-    @TableField(exist = false)
-    private Set<TowerProjectPlace> places2;
-
-}

src/main/java/com/gxwebsoft/tower/entity/TowerProjectOrder.java

@@ -1,87 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 合同签订设备清单
- *
- * @author 科技小王子
- * @since 2023-06-07 18:48:56
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerProjectOrder对象", description = "合同签订设备清单")
-public class TowerProjectOrder implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "project_order_id", type = IdType.AUTO)
-    private Integer projectOrderId;
-
-    @ApiModelProperty(value = "key")
-    @TableField(exist = false)
-    private String key;
-
-    @ApiModelProperty(value = "项目ID")
-    private Integer projectId;
-
-    @ApiModelProperty(value = "设备名称")
-    private String equipmentName;
-
-    @ApiModelProperty(value = "规格型号")
-    private String equipmentModel;
-
-    @ApiModelProperty(value = "签订数量")
-    private Integer equipmentNum;
-
-    @ApiModelProperty(value = "单位")
-    private String unit;
-
-    @ApiModelProperty(value = "预计进场时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date startTime;
-
-    @ApiModelProperty(value = "预计退场时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date endTime;
-
-    @ApiModelProperty(value = "出厂年限")
-    private String year;
-
-    @ApiModelProperty(value = "对应资料员")
-    private String documenter;
-
-    @ApiModelProperty(value = "状态")
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "排序号")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-}

src/main/java/com/gxwebsoft/tower/entity/TowerProjectPlace.java

@@ -1,60 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 检查/保养部位配置表
- *
- * @author 科技小王子
- * @since 2023-06-08 17:22:55
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerProjectPlace对象", description = "检查/保养部位配置表")
-public class TowerProjectPlace implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "项目ID")
-    private Integer projectId;
-
-    @ApiModelProperty(value = "部位ID")
-    private Integer placeId;
-
-    @ApiModelProperty(value = "排序号")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "部位编码")
-    @TableField(exist = false)
-    private String placeCode;
-
-    @ApiModelProperty(value = "设备名称")
-    @TableField(exist = false)
-    private String equipmentType;
-
-    @ApiModelProperty(value = "检查部位")
-    @TableField(exist = false)
-    private String name;
-
-    @ApiModelProperty(value = "部位类型")
-    @TableField(exist = false)
-    private String type;
-}

src/main/java/com/gxwebsoft/tower/entity/TowerProjectUser.java

@@ -1,72 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 项目成员
- *
- * @author 科技小王子
- * @since 2023-06-07 15:00:32
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerProjectUser对象", description = "项目成员")
-public class TowerProjectUser implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "角色，10可见成员 20项目成员 30管理员 ")
-    private Integer role;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "项目ID")
-    private Integer projectId;
-
-    @ApiModelProperty(value = "状态, 0正常, 1待确认")
-    private Integer status;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "用户名")
-    @TableField(exist = false)
-    private String username;
-
-    @ApiModelProperty(value = "手机号码")
-    @TableField(exist = false)
-    private String phone;
-
-    @ApiModelProperty(value = "邮箱")
-    @TableField(exist = false)
-    private String email;
-
-    @ApiModelProperty(value = "头像")
-    @TableField(exist = false)
-    private String avatar;
-
-    @ApiModelProperty(value = "所在部门")
-    @TableField(exist = false)
-    private String organizationName;
-
-}

src/main/java/com/gxwebsoft/tower/entity/TowerWarehouse.java

@@ -1,88 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 仓库管理
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerWarehouse对象", description = "仓库管理")
-public class TowerWarehouse implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "warehouse_id", type = IdType.AUTO)
-    private Integer warehouseId;
-
-    @ApiModelProperty(value = "仓库名称")
-    private String warehouseName;
-
-    @ApiModelProperty(value = "负责人")
-    private String warehouseKeeper;
-
-    @ApiModelProperty(value = "联系电话")
-    private String warehousePhone;
-
-    @ApiModelProperty(value = "经度")
-    private String longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private String latitude;
-
-    @ApiModelProperty(value = "所在国家")
-    private String country;
-
-    @ApiModelProperty(value = "所在省份")
-    private String province;
-
-    @ApiModelProperty(value = "所在城市")
-    private String city;
-
-    @ApiModelProperty(value = "所在辖区")
-    private String region;
-
-    @ApiModelProperty(value = "街道地址")
-    private String address;
-
-    @ApiModelProperty(value = "区域名称")
-    private String regionName;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}

src/main/java/com/gxwebsoft/tower/mapper/TowerAccessoryMapper.java

@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerAccessory;
-import com.gxwebsoft.tower.param.TowerAccessoryParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 配件管理Mapper
- *
- * @author 科技小王子
- * @since 2023-05-22 11:53:48
- */
-public interface TowerAccessoryMapper extends BaseMapper<TowerAccessory> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerAccessory>
-     */
-    List<TowerAccessory> selectPageRel(@Param("page") IPage<TowerAccessory> page,
-                             @Param("param") TowerAccessoryParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerAccessory> selectListRel(@Param("param") TowerAccessoryParam param);
-
-}

src/main/java/com/gxwebsoft/tower/mapper/TowerEquipmentMapper.java

@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerEquipment;
-import com.gxwebsoft.tower.param.TowerEquipmentParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 塔吊设备管理Mapper
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-public interface TowerEquipmentMapper extends BaseMapper<TowerEquipment> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerEquipment>
-     */
-    List<TowerEquipment> selectPageRel(@Param("page") IPage<TowerEquipment> page,
-                             @Param("param") TowerEquipmentParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerEquipment> selectListRel(@Param("param") TowerEquipmentParam param);
-
-}

src/main/java/com/gxwebsoft/tower/mapper/TowerModelMapper.java

@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerModel;
-import com.gxwebsoft.tower.param.TowerModelParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 设备型号管理表Mapper
- *
- * @author 科技小王子
- * @since 2023-05-29 14:07:46
- */
-public interface TowerModelMapper extends BaseMapper<TowerModel> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerModel>
-     */
-    List<TowerModel> selectPageRel(@Param("page") IPage<TowerModel> page,
-                             @Param("param") TowerModelParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerModel> selectListRel(@Param("param") TowerModelParam param);
-
-}

src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceMapper.java

@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerPlace;
-import com.gxwebsoft.tower.param.TowerPlaceParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 检查/保养部位记录表Mapper
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-public interface TowerPlaceMapper extends BaseMapper<TowerPlace> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerPlace>
-     */
-    List<TowerPlace> selectPageRel(@Param("page") IPage<TowerPlace> page,
-                             @Param("param") TowerPlaceParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerPlace> selectListRel(@Param("param") TowerPlaceParam param);
-
-}

src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceSafetyMapper.java

@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerPlaceSafety;
-import com.gxwebsoft.tower.param.TowerPlaceSafetyParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 安全巡检部位管理表Mapper
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-public interface TowerPlaceSafetyMapper extends BaseMapper<TowerPlaceSafety> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerPlaceSafety>
-     */
-    List<TowerPlaceSafety> selectPageRel(@Param("page") IPage<TowerPlaceSafety> page,
-                             @Param("param") TowerPlaceSafetyParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerPlaceSafety> selectListRel(@Param("param") TowerPlaceSafetyParam param);
-
-}

src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceStandardMapper.java

@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerPlaceStandard;
-import com.gxwebsoft.tower.param.TowerPlaceStandardParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 检查标准附件表Mapper
- *
- * @author 科技小王子
- * @since 2023-06-08 15:37:00
- */
-public interface TowerPlaceStandardMapper extends BaseMapper<TowerPlaceStandard> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerPlaceStandard>
-     */
-    List<TowerPlaceStandard> selectPageRel(@Param("page") IPage<TowerPlaceStandard> page,
-                             @Param("param") TowerPlaceStandardParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerPlaceStandard> selectListRel(@Param("param") TowerPlaceStandardParam param);
-
-}

src/main/java/com/gxwebsoft/tower/mapper/TowerProjectMapper.java

@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerProject;
-import com.gxwebsoft.tower.param.TowerProjectParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 项目管理Mapper
- *
- * @author 科技小王子
- * @since 2023-05-22 13:30:39
- */
-public interface TowerProjectMapper extends BaseMapper<TowerProject> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerProject>
-     */
-    List<TowerProject> selectPageRel(@Param("page") IPage<TowerProject> page,
-                             @Param("param") TowerProjectParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerProject> selectListRel(@Param("param") TowerProjectParam param);
-
-}

src/main/java/com/gxwebsoft/tower/mapper/TowerProjectOrderMapper.java

@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerProjectOrder;
-import com.gxwebsoft.tower.param.TowerProjectOrderParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 合同签订设备清单Mapper
- *
- * @author 科技小王子
- * @since 2023-06-07 18:48:56
- */
-public interface TowerProjectOrderMapper extends BaseMapper<TowerProjectOrder> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerProjectOrder>
-     */
-    List<TowerProjectOrder> selectPageRel(@Param("page") IPage<TowerProjectOrder> page,
-                             @Param("param") TowerProjectOrderParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerProjectOrder> selectListRel(@Param("param") TowerProjectOrderParam param);
-
-}

src/main/java/com/gxwebsoft/tower/mapper/TowerProjectPlaceMapper.java

@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerProjectPlace;
-import com.gxwebsoft.tower.param.TowerProjectPlaceParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 检查/保养部位配置表Mapper
- *
- * @author 科技小王子
- * @since 2023-06-08 17:22:55
- */
-public interface TowerProjectPlaceMapper extends BaseMapper<TowerProjectPlace> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerProjectPlace>
-     */
-    List<TowerProjectPlace> selectPageRel(@Param("page") IPage<TowerProjectPlace> page,
-                             @Param("param") TowerProjectPlaceParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerProjectPlace> selectListRel(@Param("param") TowerProjectPlaceParam param);
-
-}

src/main/java/com/gxwebsoft/tower/mapper/TowerProjectUserMapper.java

@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerProjectUser;
-import com.gxwebsoft.tower.param.TowerProjectUserParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 项目成员Mapper
- *
- * @author 科技小王子
- * @since 2023-06-07 15:00:32
- */
-public interface TowerProjectUserMapper extends BaseMapper<TowerProjectUser> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerProjectUser>
-     */
-    List<TowerProjectUser> selectPageRel(@Param("page") IPage<TowerProjectUser> page,
-                             @Param("param") TowerProjectUserParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerProjectUser> selectListRel(@Param("param") TowerProjectUserParam param);
-
-}

src/main/java/com/gxwebsoft/tower/mapper/TowerWarehouseMapper.java

@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerWarehouse;
-import com.gxwebsoft.tower.param.TowerWarehouseParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 仓库管理Mapper
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-public interface TowerWarehouseMapper extends BaseMapper<TowerWarehouse> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerWarehouse>
-     */
-    List<TowerWarehouse> selectPageRel(@Param("page") IPage<TowerWarehouse> page,
-                             @Param("param") TowerWarehouseParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerWarehouse> selectListRel(@Param("param") TowerWarehouseParam param);
-
-}

src/main/java/com/gxwebsoft/tower/mapper/xml/TowerAccessoryMapper.xml

@@ -1,96 +0,0 @@
-<?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.gxwebsoft.tower.mapper.TowerAccessoryMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_accessory a
-        <where>
-            <if test="param.accessoryId != null">
-                AND a.accessory_id = #{param.accessoryId}
-            </if>
-            <if test="param.accessoryName != null">
-                AND a.accessory_name LIKE CONCAT('%', #{param.accessoryName}, '%')
-            </if>
-            <if test="param.accessoryCategory != null">
-                AND a.accessory_category LIKE CONCAT('%', #{param.accessoryCategory}, '%')
-            </if>
-            <if test="param.accessoryModel != null">
-                AND a.accessory_model LIKE CONCAT('%', #{param.accessoryModel}, '%')
-            </if>
-            <if test="param.accessorySpecs != null">
-                AND a.accessory_specs LIKE CONCAT('%', #{param.accessorySpecs}, '%')
-            </if>
-            <if test="param.accessoryPrice != null">
-                AND a.accessory_price = #{param.accessoryPrice}
-            </if>
-            <if test="param.accessoryUnit != null">
-                AND a.accessory_unit LIKE CONCAT('%', #{param.accessoryUnit}, '%')
-            </if>
-            <if test="param.accessoryStock != null">
-                AND a.accessory_stock LIKE CONCAT('%', #{param.accessoryStock}, '%')
-            </if>
-            <if test="param.companyName != null">
-                AND a.company_name LIKE CONCAT('%', #{param.companyName}, '%')
-            </if>
-            <if test="param.manufactor != null">
-                AND a.manufactor LIKE CONCAT('%', #{param.manufactor}, '%')
-            </if>
-            <if test="param.manufactorNo != null">
-                AND a.manufactor_no LIKE CONCAT('%', #{param.manufactorNo}, '%')
-            </if>
-            <if test="param.lifeYear != null">
-                AND a.life_year LIKE CONCAT('%', #{param.lifeYear}, '%')
-            </if>
-            <if test="param.factoryDate != null">
-                AND a.factory_date LIKE CONCAT('%', #{param.factoryDate}, '%')
-            </if>
-            <if test="param.scrapDate != null">
-                AND a.scrap_date LIKE CONCAT('%', #{param.scrapDate}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.keywords != null">
-            AND (
-            a.accessory_name LIKE CONCAT('%', #{param.keywords}, '%')
-            OR a.accessory_no LIKE CONCAT('%', #{param.keywords}, '%')
-            OR a.company_name LIKE CONCAT('%', #{param.keywords}, '%')
-            )
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerAccessory">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerAccessory">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>

src/main/java/com/gxwebsoft/tower/mapper/xml/TowerEquipmentMapper.xml

@@ -1,115 +0,0 @@
-<?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.gxwebsoft.tower.mapper.TowerEquipmentMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_equipment a
-        <where>
-            <if test="param.equipmentId != null">
-                AND a.equipment_id = #{param.equipmentId}
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.model != null">
-                AND a.model LIKE CONCAT('%', #{param.model}, '%')
-            </if>
-            <if test="param.equipmentNo != null">
-                AND a.equipment_no LIKE CONCAT('%', #{param.equipmentNo}, '%')
-            </if>
-            <if test="param.factoryNo != null">
-                AND a.factory_no LIKE CONCAT('%', #{param.factoryNo}, '%')
-            </if>
-            <if test="param.factoryDate != null">
-                AND a.factory_date LIKE CONCAT('%', #{param.factoryDate}, '%')
-            </if>
-            <if test="param.manufactor != null">
-                AND a.manufactor LIKE CONCAT('%', #{param.manufactor}, '%')
-            </if>
-            <if test="param.lifeYear != null">
-                AND a.life_year LIKE CONCAT('%', #{param.lifeYear}, '%')
-            </if>
-            <if test="param.scrapDate != null">
-                AND a.scrap_date LIKE CONCAT('%', #{param.scrapDate}, '%')
-            </if>
-            <if test="param.licenceNo != null">
-                AND a.licence_no LIKE CONCAT('%', #{param.licenceNo}, '%')
-            </if>
-            <if test="param.company != null">
-                AND a.company = #{param.company}
-            </if>
-            <if test="param.organization != null">
-                AND a.organization = #{param.organization}
-            </if>
-            <if test="param.warehouse != null">
-                AND a.warehouse = #{param.warehouse}
-            </if>
-            <if test="param.source != null">
-                AND a.source LIKE CONCAT('%', #{param.source}, '%')
-            </if>
-            <if test="param.buyDate != null">
-                AND a.buy_date LIKE CONCAT('%', #{param.buyDate}, '%')
-            </if>
-            <if test="param.currentLocation != null">
-                AND a.current_location LIKE CONCAT('%', #{param.currentLocation}, '%')
-            </if>
-            <if test="param.designHeight != null">
-                AND a.design_height LIKE CONCAT('%', #{param.designHeight}, '%')
-            </if>
-            <if test="param.height != null">
-                AND a.height LIKE CONCAT('%', #{param.height}, '%')
-            </if>
-            <if test="param.ratedLoad != null">
-                AND a.rated_load LIKE CONCAT('%', #{param.ratedLoad}, '%')
-            </if>
-            <if test="param.maxRatedLoad != null">
-                AND a.max_rated_load LIKE CONCAT('%', #{param.maxRatedLoad}, '%')
-            </if>
-            <if test="param.files != null">
-                AND a.files LIKE CONCAT('%', #{param.files}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-              AND (
-              a.name LIKE CONCAT('%', #{param.keywords}, '%')
-              OR a.model LIKE CONCAT('%', #{param.keywords}, '%')
-              OR a.equipment_no LIKE CONCAT('%', #{param.keywords}, '%')
-              OR a.company LIKE CONCAT('%', #{param.keywords}, '%')
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerEquipment">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerEquipment">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>

src/main/java/com/gxwebsoft/tower/mapper/xml/TowerModelMapper.xml

@@ -1,71 +0,0 @@
-<?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.gxwebsoft.tower.mapper.TowerModelMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_model a
-        <where>
-            <if test="param.modelId != null">
-                AND a.model_id = #{param.modelId}
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.model != null">
-              AND a.model LIKE CONCAT('%', #{param.model}, '%')
-            </if>
-            <if test="param.parentId != null">
-                AND a.parent_id = #{param.parentId}
-            </if>
-            <if test="param.image != null">
-                AND a.image LIKE CONCAT('%', #{param.image}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.yearLife != null">
-                AND a.year_life = #{param.yearLife}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.keywords != null">
-            AND (
-            a.name LIKE CONCAT('%', #{param.keywords}, '%')
-            OR a.model LIKE CONCAT('%', #{param.keywords}, '%')
-            )
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerModel">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerModel">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>

src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceMapper.xml

@@ -1,83 +0,0 @@
-<?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.gxwebsoft.tower.mapper.TowerPlaceMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_place a
-        <where>
-            <if test="param.placeId != null">
-                AND a.place_id = #{param.placeId}
-            </if>
-            <if test="param.placeCode != null">
-                AND a.place_code LIKE CONCAT('%', #{param.placeCode}, '%')
-            </if>
-            <if test="param.equipmentType != null">
-                AND a.equipment_type LIKE CONCAT('%', #{param.equipmentType}, '%')
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.standard != null">
-                AND a.standard LIKE CONCAT('%', #{param.standard}, '%')
-            </if>
-            <if test="param.type != null">
-                AND a.type LIKE CONCAT('%', #{param.type}, '%')
-            </if>
-            <if test="param.pushSystem != null">
-                AND a.push_system LIKE CONCAT('%', #{param.pushSystem}, '%')
-            </if>
-            <if test="param.otherParam != null">
-                AND a.other_param LIKE CONCAT('%', #{param.otherParam}, '%')
-            </if>
-            <if test="param.files != null">
-                AND a.files LIKE CONCAT('%', #{param.files}, '%')
-            </if>
-            <if test="param.isShow != null">
-                AND a.is_show = #{param.isShow}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-              AND (a.equipment_type LIKE CONCAT('%', #{param.keywords}, '%')
-              OR a.place_code = #{param.keywords}
-              OR a.name #{param.keywords}
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerPlace">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerPlace">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>

src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceSafetyMapper.xml

@@ -1,77 +0,0 @@
-<?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.gxwebsoft.tower.mapper.TowerPlaceSafetyMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_place_safety a
-        <where>
-            <if test="param.placeSafetyId != null">
-                AND a.place_safety_id = #{param.placeSafetyId}
-            </if>
-            <if test="param.placeCode != null">
-                AND a.place_code LIKE CONCAT('%', #{param.placeCode}, '%')
-            </if>
-            <if test="param.equipmentType != null">
-                AND a.equipment_type LIKE CONCAT('%', #{param.equipmentType}, '%')
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.checkStandard != null">
-                AND a.check_standard LIKE CONCAT('%', #{param.checkStandard}, '%')
-            </if>
-            <if test="param.type != null">
-                AND a.type LIKE CONCAT('%', #{param.type}, '%')
-            </if>
-            <if test="param.pushSystem != null">
-                AND a.push_system LIKE CONCAT('%', #{param.pushSystem}, '%')
-            </if>
-            <if test="param.otherParam != null">
-                AND a.other_param LIKE CONCAT('%', #{param.otherParam}, '%')
-            </if>
-            <if test="param.files != null">
-                AND a.files LIKE CONCAT('%', #{param.files}, '%')
-            </if>
-            <if test="param.isShow != null">
-                AND a.is_show = #{param.isShow}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerPlaceSafety">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerPlaceSafety">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>

src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceStandardMapper.xml

@@ -1,44 +0,0 @@
-<?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.gxwebsoft.tower.mapper.TowerPlaceStandardMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_place_standard a
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.placeId != null">
-                AND a.place_id = #{param.placeId}
-            </if>
-            <if test="param.standard != null">
-                AND a.standard LIKE CONCAT('%', #{param.standard}, '%')
-            </if>
-            <if test="param.files != null">
-                AND a.files LIKE CONCAT('%', #{param.files}, '%')
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerPlaceStandard">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerPlaceStandard">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>

src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectMapper.xml

@@ -1,104 +0,0 @@
-<?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.gxwebsoft.tower.mapper.TowerProjectMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_project a
-        <where>
-            <if test="param.projectId != null">
-                AND a.project_id = #{param.projectId}
-            </if>
-            <if test="param.projectName != null">
-                AND a.project_name LIKE CONCAT('%', #{param.projectName}, '%')
-            </if>
-            <if test="param.companyName != null">
-                AND a.company_name LIKE CONCAT('%', #{param.companyName}, '%')
-            </if>
-            <if test="param.customerName != null">
-                AND a.customer_name LIKE CONCAT('%', #{param.customerName}, '%')
-            </if>
-            <if test="param.projectRegion != null">
-                AND a.project_region LIKE CONCAT('%', #{param.projectRegion}, '%')
-            </if>
-            <if test="param.projectAddress != null">
-                AND a.project_address LIKE CONCAT('%', #{param.projectAddress}, '%')
-            </if>
-            <if test="param.longitude != null">
-                AND a.longitude LIKE CONCAT('%', #{param.longitude}, '%')
-            </if>
-            <if test="param.latitude != null">
-                AND a.latitude LIKE CONCAT('%', #{param.latitude}, '%')
-            </if>
-            <if test="param.superviseNo != null">
-                AND a.supervise_no LIKE CONCAT('%', #{param.superviseNo}, '%')
-            </if>
-            <if test="param.licenceNo != null">
-                AND a.licence_no LIKE CONCAT('%', #{param.licenceNo}, '%')
-            </if>
-            <if test="param.securityStatus != null">
-                AND a.security_status LIKE CONCAT('%', #{param.securityStatus}, '%')
-            </if>
-            <if test="param.competentDepartment != null">
-                AND a.competent_department LIKE CONCAT('%', #{param.competentDepartment}, '%')
-            </if>
-            <if test="param.dismantlingCompany != null">
-                AND a.dismantling_company LIKE CONCAT('%', #{param.dismantlingCompany}, '%')
-            </if>
-            <if test="param.truckCraneSpecs != null">
-                AND a.truck_crane_specs LIKE CONCAT('%', #{param.truckCraneSpecs}, '%')
-            </if>
-            <if test="param.contract != null">
-                AND a.contract LIKE CONCAT('%', #{param.contract}, '%')
-            </if>
-            <if test="param.director != null">
-                AND a.director = #{param.director}
-            </if>
-            <if test="param.projectDirector != null">
-                AND a.project_director LIKE CONCAT('%', #{param.projectDirector}, '%')
-            </if>
-            <if test="param.projectStatus != null">
-                AND a.project_status LIKE CONCAT('%', #{param.projectStatus}, '%')
-            </if>
-            <if test="param.salesman != null">
-                AND a.salesman LIKE CONCAT('%', #{param.salesman}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerProject">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerProject">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>

src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectOrderMapper.xml

@@ -1,77 +0,0 @@
-<?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.gxwebsoft.tower.mapper.TowerProjectOrderMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_project_order a
-        <where>
-            <if test="param.projectOrderId != null">
-                AND a.project_order_id = #{param.projectOrderId}
-            </if>
-          <if test="param.projectId != null">
-            AND a.project_id = #{param.projectId}
-          </if>
-            <if test="param.equipmentName != null">
-                AND a.equipment_name LIKE CONCAT('%', #{param.equipmentName}, '%')
-            </if>
-            <if test="param.equipmentModel != null">
-                AND a.equipment_model LIKE CONCAT('%', #{param.equipmentModel}, '%')
-            </if>
-            <if test="param.equipmentNum != null">
-                AND a.equipment_num = #{param.equipmentNum}
-            </if>
-            <if test="param.unit != null">
-                AND a.unit LIKE CONCAT('%', #{param.unit}, '%')
-            </if>
-            <if test="param.startTime != null">
-                AND a.start_time LIKE CONCAT('%', #{param.startTime}, '%')
-            </if>
-            <if test="param.endTime != null">
-                AND a.end_time LIKE CONCAT('%', #{param.endTime}, '%')
-            </if>
-            <if test="param.year != null">
-                AND a.year LIKE CONCAT('%', #{param.year}, '%')
-            </if>
-            <if test="param.documenter != null">
-                AND a.documenter LIKE CONCAT('%', #{param.documenter}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerProjectOrder">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerProjectOrder">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>

src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectPlaceMapper.xml

@@ -1,50 +0,0 @@
-<?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.gxwebsoft.tower.mapper.TowerProjectPlaceMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,b.name,b.place_code,b.place_id,b.equipment_type,b.type
-        FROM tower_project_place a
-        LEFT JOIN tower_place b ON a.place_id = b.place_id
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.projectId != null">
-                AND a.project_id = #{param.projectId}
-            </if>
-            <if test="param.placeId != null">
-                AND a.place_id = #{param.placeId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-              AND (
-              b.name LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.place_code LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.type LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.equipment_type LIKE CONCAT('%', #{param.keywords}, '%')
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerProjectPlace">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerProjectPlace">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>

src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectUserMapper.xml

@@ -1,53 +0,0 @@
-<?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.gxwebsoft.tower.mapper.TowerProjectUserMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*, b.nickname,b.email,b.phone,b.avatar,c.organization_name
-        FROM tower_project_user a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        LEFT JOIN sys_organization c ON b.organization_id = c.organization_id
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.role != null">
-                AND a.role = #{param.role}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.projectId != null">
-                AND a.project_id = #{param.projectId}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-              AND (b.nickname LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.email LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.username LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.phone LIKE CONCAT('%', #{param.keywords}, '%')
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerProjectUser">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerProjectUser">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>

src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWarehouseMapper.xml

@@ -1,87 +0,0 @@
-<?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.gxwebsoft.tower.mapper.TowerWarehouseMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_warehouse a
-        <where>
-            <if test="param.warehouseId != null">
-                AND a.warehouse_id = #{param.warehouseId}
-            </if>
-            <if test="param.warehouseName != null">
-                AND a.warehouse_name LIKE CONCAT('%', #{param.warehouseName}, '%')
-            </if>
-            <if test="param.warehouseKeeper != null">
-                AND a.warehouse_keeper LIKE CONCAT('%', #{param.warehouseKeeper}, '%')
-            </if>
-            <if test="param.warehousePhone != null">
-                AND a.warehouse_phone LIKE CONCAT('%', #{param.warehousePhone}, '%')
-            </if>
-            <if test="param.longitude != null">
-                AND a.longitude LIKE CONCAT('%', #{param.longitude}, '%')
-            </if>
-            <if test="param.latitude != null">
-                AND a.latitude LIKE CONCAT('%', #{param.latitude}, '%')
-            </if>
-            <if test="param.country != null">
-                AND a.country LIKE CONCAT('%', #{param.country}, '%')
-            </if>
-            <if test="param.province != null">
-                AND a.province LIKE CONCAT('%', #{param.province}, '%')
-            </if>
-            <if test="param.city != null">
-                AND a.city LIKE CONCAT('%', #{param.city}, '%')
-            </if>
-            <if test="param.region != null">
-                AND a.region LIKE CONCAT('%', #{param.region}, '%')
-            </if>
-            <if test="param.address != null">
-                AND a.address LIKE CONCAT('%', #{param.address}, '%')
-            </if>
-            <if test="param.regionName != null">
-                AND a.region_name LIKE CONCAT('%', #{param.regionName}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.username != null">
-                AND a.username = #{param.username}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-              AND (a.title LIKE CONCAT('%', #{param.keywords}, '%')
-              OR a.warehouse_name = #{param.keywords
-              OR a.warehouse_keeper = #{param.keywords}
-              OR a.warehouse_phone = #{param.keywords}
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerWarehouse">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerWarehouse">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>

src/main/java/com/gxwebsoft/tower/param/TowerAccessoryParam.java

@@ -1,90 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 配件管理查询参数
- *
- * @author 科技小王子
- * @since 2023-05-22 11:53:48
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerAccessoryParam对象", description = "配件管理查询参数")
-public class TowerAccessoryParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer accessoryId;
-
-    @ApiModelProperty(value = "配件名称")
-    private String accessoryName;
-
-    @ApiModelProperty(value = "配件分类")
-    private String accessoryCategory;
-
-    @ApiModelProperty(value = "适用设备型号")
-    private String accessoryModel;
-
-    @ApiModelProperty(value = "配件规格")
-    private String accessorySpecs;
-
-    @ApiModelProperty(value = "单价")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal accessoryPrice;
-
-    @ApiModelProperty(value = "配件单位")
-    private String accessoryUnit;
-
-    @ApiModelProperty(value = "库存总量")
-    private String accessoryStock;
-
-    @ApiModelProperty(value = "产权单位名称")
-    private String companyName;
-
-    @ApiModelProperty(value = "制造厂商")
-    private String manufactor;
-
-    @ApiModelProperty(value = "制造厂商编号")
-    private String manufactorNo;
-
-    @ApiModelProperty(value = "使用年限")
-    private String lifeYear;
-
-    @ApiModelProperty(value = "出厂日期")
-    private String factoryDate;
-
-    @ApiModelProperty(value = "报废日期")
-    private String scrapDate;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "排序号")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "所有人")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}

src/main/java/com/gxwebsoft/tower/param/TowerEquipmentParam.java

@@ -1,110 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 塔吊设备管理查询参数
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerEquipmentParam对象", description = "塔吊设备管理查询参数")
-public class TowerEquipmentParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "设备名称")
-    private String name;
-
-    @ApiModelProperty(value = "设备型号")
-    private String model;
-
-    @ApiModelProperty(value = "设备编号")
-    private String equipmentNo;
-
-    @ApiModelProperty(value = "出厂编号")
-    private String factoryNo;
-
-    @ApiModelProperty(value = "出厂日期")
-    private String factoryDate;
-
-    @ApiModelProperty(value = "制造厂商")
-    private String manufactor;
-
-    @ApiModelProperty(value = "使用年限")
-    private String lifeYear;
-
-    @ApiModelProperty(value = "报废日期")
-    private String scrapDate;
-
-    @ApiModelProperty(value = "备案许可证号")
-    private String licenceNo;
-
-    @ApiModelProperty(value = "产权单位")
-    @QueryField(type = QueryType.EQ)
-    private String company;
-
-    @ApiModelProperty(value = "产权单位名称")
-    private String propertyCompany;
-
-    @ApiModelProperty(value = "所属部门")
-    @QueryField(type = QueryType.EQ)
-    private String organization;
-
-    @ApiModelProperty(value = "所属仓库")
-    @QueryField(type = QueryType.EQ)
-    private String warehouse;
-
-    @ApiModelProperty(value = "设备来源")
-    private String source;
-
-    @ApiModelProperty(value = "采购日期")
-    private String buyDate;
-
-    @ApiModelProperty(value = "当前位置")
-    private String currentLocation;
-
-    @ApiModelProperty(value = "设计高度")
-    private String designHeight;
-
-    @ApiModelProperty(value = "独立高度")
-    private String height;
-
-    @ApiModelProperty(value = "额定载重")
-    private String ratedLoad;
-
-    @ApiModelProperty(value = "最大幅度处额定载重")
-    private String maxRatedLoad;
-
-    @ApiModelProperty(value = "附件信息")
-    private String files;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "所有人")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}

src/main/java/com/gxwebsoft/tower/param/TowerModelParam.java

@@ -1,64 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 设备型号管理表查询参数
- *
- * @author 科技小王子
- * @since 2023-05-29 14:07:46
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerModelParam对象", description = "设备型号管理表查询参数")
-public class TowerModelParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "型号ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer modelId;
-
-    @ApiModelProperty(value = "设备名称")
-    private String name;
-
-    @ApiModelProperty(value = "设备型号")
-    private String model;
-
-    @ApiModelProperty(value = "上级分类ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer parentId;
-
-    @ApiModelProperty(value = "分类图片")
-    private String image;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "使用年限")
-    private Integer yearLife;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}

src/main/java/com/gxwebsoft/tower/param/TowerPlaceParam.java

@@ -1,81 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.gxwebsoft.tower.entity.TowerPlaceStandard;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-/**
- * 检查/保养部位记录表查询参数
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerPlaceParam对象", description = "检查/保养部位记录表查询参数")
-public class TowerPlaceParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "参数ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer placeId;
-
-    @ApiModelProperty(value = "部位编码")
-    private String placeCode;
-
-    @ApiModelProperty(value = "设备类型")
-    private String equipmentType;
-
-    @ApiModelProperty(value = "部位名称")
-    private String name;
-
-    @ApiModelProperty(value = "检查/保养标准")
-    @TableField(exist = false)
-    private List<TowerPlaceStandard> standard;
-
-    @ApiModelProperty(value = "部位类型")
-    private String type;
-
-    @ApiModelProperty(value = "推送目标系统")
-    private String pushSystem;
-
-    @ApiModelProperty(value = "其它项目对应值")
-    private String otherParam;
-
-    @ApiModelProperty(value = "附件")
-    private String files;
-
-    @ApiModelProperty(value = "是否默认显示")
-    @QueryField(type = QueryType.EQ)
-    private Integer isShow;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}

src/main/java/com/gxwebsoft/tower/param/TowerPlaceSafetyParam.java

@@ -1,76 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 安全巡检部位管理表查询参数
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerPlaceSafetyParam对象", description = "安全巡检部位管理表查询参数")
-public class TowerPlaceSafetyParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "参数ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer placeSafetyId;
-
-    @ApiModelProperty(value = "部位编码")
-    private String placeCode;
-
-    @ApiModelProperty(value = "设备类型")
-    private String equipmentType;
-
-    @ApiModelProperty(value = "安全巡检部位名称")
-    private String name;
-
-    @ApiModelProperty(value = "检查标准")
-    private String checkStandard;
-
-    @ApiModelProperty(value = "部位类型")
-    private String type;
-
-    @ApiModelProperty(value = "推送目标系统")
-    private String pushSystem;
-
-    @ApiModelProperty(value = "其它项目对应值")
-    private String otherParam;
-
-    @ApiModelProperty(value = "附件")
-    private String files;
-
-    @ApiModelProperty(value = "是否默认显示")
-    @QueryField(type = QueryType.EQ)
-    private Integer isShow;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}

src/main/java/com/gxwebsoft/tower/param/TowerPlaceStandardParam.java

@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 检查标准附件表查询参数
- *
- * @author 科技小王子
- * @since 2023-06-08 15:37:00
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerPlaceStandardParam对象", description = "检查标准附件表查询参数")
-public class TowerPlaceStandardParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "参数ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer placeId;
-
-    @ApiModelProperty(value = "检查标准")
-    private String standard;
-
-    @ApiModelProperty(value = "附件")
-    private String files;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-}

src/main/java/com/gxwebsoft/tower/param/TowerProjectOrderParam.java

@@ -1,87 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.gxwebsoft.tower.entity.TowerProjectOrder;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-/**
- * 合同签订设备清单查询参数
- *
- * @author 科技小王子
- * @since 2023-06-07 18:48:56
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerProjectOrderParam对象", description = "合同签订设备清单查询参数")
-public class TowerProjectOrderParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer projectOrderId;
-
-    @ApiModelProperty(value = "项目ID")
-    private Integer projectId;
-
-    @ApiModelProperty(value = "设备名称")
-    private String equipmentName;
-
-    @ApiModelProperty(value = "规格型号")
-    private String equipmentModel;
-
-    @ApiModelProperty(value = "签订数量")
-    @QueryField(type = QueryType.EQ)
-    private Integer equipmentNum;
-
-    @ApiModelProperty(value = "单位")
-    private String unit;
-
-    @ApiModelProperty(value = "预计进场时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private String startTime;
-
-    @ApiModelProperty(value = "预计退场时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private String endTime;
-
-    @ApiModelProperty(value = "出厂年限")
-    private String year;
-
-    @ApiModelProperty(value = "对应资料员")
-    private String documenter;
-
-    @ApiModelProperty(value = "状态")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "排序号")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "合同预定设备清单")
-    @TableField(exist = false)
-    private List<TowerProjectOrder> orders;
-
-}

src/main/java/com/gxwebsoft/tower/param/TowerProjectParam.java

@@ -1,128 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.gxwebsoft.tower.entity.TowerProjectOrder;
-import com.gxwebsoft.tower.entity.TowerProjectPlace;
-import com.gxwebsoft.tower.entity.TowerProjectUser;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Set;
-
-/**
- * 项目管理查询参数
- *
- * @author 科技小王子
- * @since 2023-05-22 13:30:39
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerProjectParam对象", description = "项目管理查询参数")
-public class TowerProjectParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer projectId;
-
-    @ApiModelProperty(value = "配件名称")
-    private String projectName;
-
-    @ApiModelProperty(value = "项目图片")
-    private String projectImage;
-
-    @ApiModelProperty(value = "租赁单位")
-    private String companyName;
-
-    @ApiModelProperty(value = "承租单位")
-    private String customerName;
-
-    @ApiModelProperty(value = "项目地址")
-    private String projectRegion;
-
-    @ApiModelProperty(value = "详细地址")
-    private String projectAddress;
-
-    @ApiModelProperty(value = "经度")
-    private String longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private String latitude;
-
-    @ApiModelProperty(value = "报监编号")
-    private String superviseNo;
-
-    @ApiModelProperty(value = "施工许可证")
-    private String licenceNo;
-
-    @ApiModelProperty(value = "安全状态")
-    private String securityStatus;
-
-    @ApiModelProperty(value = "主管部门")
-    private String competentDepartment;
-
-    @ApiModelProperty(value = "安拆单位")
-    private String dismantlingCompany;
-
-    @ApiModelProperty(value = "汽吊规格")
-    private String truckCraneSpecs;
-
-    @ApiModelProperty(value = "合同其他说明")
-    private String contract;
-
-    @ApiModelProperty(value = "项目负责人")
-    @QueryField(type = QueryType.EQ)
-    private Integer director;
-
-    @ApiModelProperty(value = "项目经理")
-    private String projectDirector;
-
-    @ApiModelProperty(value = "项目状态")
-    private String projectStatus;
-
-    @ApiModelProperty(value = "业务员")
-    private String salesman;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "排序号")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "所有人")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "项目成员")
-    @TableField(exist = false)
-    private Set<TowerProjectUser> users;
-
-    @ApiModelProperty(value = "合同预定设备清单")
-    @TableField(exist = false)
-    private Set<TowerProjectOrder> orders;
-
-    @ApiModelProperty(value = "检查部位配置")
-    @TableField(exist = false)
-    private Set<TowerProjectPlace> places1;
-
-    @ApiModelProperty(value = "保养部位配置")
-    @TableField(exist = false)
-    private Set<TowerProjectPlace> places2;
-
-}

src/main/java/com/gxwebsoft/tower/param/TowerProjectPlaceParam.java

@@ -1,54 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 检查/保养部位配置表查询参数
- *
- * @author 科技小王子
- * @since 2023-06-08 17:22:55
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerProjectPlaceParam对象", description = "检查/保养部位配置表查询参数")
-public class TowerProjectPlaceParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "项目ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer projectId;
-
-    @ApiModelProperty(value = "部位ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer placeId;
-
-    @ApiModelProperty(value = "排序号")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "部位编码")
-    @TableField(exist = false)
-    private String placeCode;
-
-    @ApiModelProperty(value = "设备名称")
-    @TableField(exist = false)
-    private String name;
-
-    @ApiModelProperty(value = "部位类型")
-    @TableField(exist = false)
-    private String type;
-
-}

src/main/java/com/gxwebsoft/tower/param/TowerProjectUserParam.java

@@ -1,66 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 项目成员查询参数
- *
- * @author 科技小王子
- * @since 2023-06-07 15:00:32
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerProjectUserParam对象", description = "项目成员查询参数")
-public class TowerProjectUserParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "角色，10可见成员 20项目成员 30管理员 ")
-    @QueryField(type = QueryType.EQ)
-    private Integer role;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "项目ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer projectId;
-
-    @ApiModelProperty(value = "状态, 0正常, 1待确认")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "用户名")
-    @TableField(exist = false)
-    private String username;
-
-    @ApiModelProperty(value = "手机号码")
-    @TableField(exist = false)
-    private String phone;
-
-    @ApiModelProperty(value = "邮箱")
-    @TableField(exist = false)
-    private String email;
-
-    @ApiModelProperty(value = "头像")
-    @TableField(exist = false)
-    private String avatar;
-
-}

src/main/java/com/gxwebsoft/tower/param/TowerWarehouseParam.java

@@ -1,77 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 仓库管理查询参数
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerWarehouseParam对象", description = "仓库管理查询参数")
-public class TowerWarehouseParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer warehouseId;
-
-    @ApiModelProperty(value = "仓库名称")
-    private String warehouseName;
-
-    @ApiModelProperty(value = "负责人")
-    private String warehouseKeeper;
-
-    @ApiModelProperty(value = "联系电话")
-    private String warehousePhone;
-
-    @ApiModelProperty(value = "经度")
-    private String longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private String latitude;
-
-    @ApiModelProperty(value = "所在国家")
-    private String country;
-
-    @ApiModelProperty(value = "所在省份")
-    private String province;
-
-    @ApiModelProperty(value = "所在城市")
-    private String city;
-
-    @ApiModelProperty(value = "所在辖区")
-    private String region;
-
-    @ApiModelProperty(value = "街道地址")
-    private String address;
-
-    @ApiModelProperty(value = "区域名称")
-    private String regionName;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "所有人")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}

src/main/java/com/gxwebsoft/tower/service/TowerAccessoryService.java

@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerAccessory;
-import com.gxwebsoft.tower.param.TowerAccessoryParam;
-
-import java.util.List;
-
-/**
- * 配件管理Service
- *
- * @author 科技小王子
- * @since 2023-05-22 11:53:48
- */
-public interface TowerAccessoryService extends IService<TowerAccessory> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerAccessory>
-     */
-    PageResult<TowerAccessory> pageRel(TowerAccessoryParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerAccessory>
-     */
-    List<TowerAccessory> listRel(TowerAccessoryParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param accessoryId 自增ID
-     * @return TowerAccessory
-     */
-    TowerAccessory getByIdRel(Integer accessoryId);
-
-}

src/main/java/com/gxwebsoft/tower/service/TowerEquipmentService.java

@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerEquipment;
-import com.gxwebsoft.tower.param.TowerEquipmentParam;
-
-import java.util.List;
-
-/**
- * 塔吊设备管理Service
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-public interface TowerEquipmentService extends IService<TowerEquipment> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerEquipment>
-     */
-    PageResult<TowerEquipment> pageRel(TowerEquipmentParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerEquipment>
-     */
-    List<TowerEquipment> listRel(TowerEquipmentParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param equipmentId 自增ID
-     * @return TowerEquipment
-     */
-    TowerEquipment getByIdRel(Integer equipmentId);
-
-}

src/main/java/com/gxwebsoft/tower/service/TowerModelService.java

@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerModel;
-import com.gxwebsoft.tower.param.TowerModelParam;
-
-import java.util.List;
-
-/**
- * 设备型号管理表Service
- *
- * @author 科技小王子
- * @since 2023-05-29 14:07:46
- */
-public interface TowerModelService extends IService<TowerModel> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerModel>
-     */
-    PageResult<TowerModel> pageRel(TowerModelParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerModel>
-     */
-    List<TowerModel> listRel(TowerModelParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param categoryId 型号ID
-     * @return TowerModel
-     */
-    TowerModel getByIdRel(Integer categoryId);
-
-}

src/main/java/com/gxwebsoft/tower/service/TowerPlaceSafetyService.java

@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerPlaceSafety;
-import com.gxwebsoft.tower.param.TowerPlaceSafetyParam;
-
-import java.util.List;
-
-/**
- * 安全巡检部位管理表Service
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-public interface TowerPlaceSafetyService extends IService<TowerPlaceSafety> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerPlaceSafety>
-     */
-    PageResult<TowerPlaceSafety> pageRel(TowerPlaceSafetyParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerPlaceSafety>
-     */
-    List<TowerPlaceSafety> listRel(TowerPlaceSafetyParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param placeSafetyId 参数ID
-     * @return TowerPlaceSafety
-     */
-    TowerPlaceSafety getByIdRel(Integer placeSafetyId);
-
-}

src/main/java/com/gxwebsoft/tower/service/TowerPlaceService.java

@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerPlace;
-import com.gxwebsoft.tower.param.TowerPlaceParam;
-
-import java.util.List;
-
-/**
- * 检查/保养部位记录表Service
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-public interface TowerPlaceService extends IService<TowerPlace> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerPlace>
-     */
-    PageResult<TowerPlace> pageRel(TowerPlaceParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerPlace>
-     */
-    List<TowerPlace> listRel(TowerPlaceParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param placeId 参数ID
-     * @return TowerPlace
-     */
-    TowerPlace getByIdRel(Integer placeId);
-
-}

src/main/java/com/gxwebsoft/tower/service/TowerPlaceStandardService.java

@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerPlaceStandard;
-import com.gxwebsoft.tower.param.TowerPlaceStandardParam;
-
-import java.util.List;
-
-/**
- * 检查标准附件表Service
- *
- * @author 科技小王子
- * @since 2023-06-08 15:37:00
- */
-public interface TowerPlaceStandardService extends IService<TowerPlaceStandard> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerPlaceStandard>
-     */
-    PageResult<TowerPlaceStandard> pageRel(TowerPlaceStandardParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerPlaceStandard>
-     */
-    List<TowerPlaceStandard> listRel(TowerPlaceStandardParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 参数ID
-     * @return TowerPlaceStandard
-     */
-    TowerPlaceStandard getByIdRel(Integer id);
-
-}

src/main/java/com/gxwebsoft/tower/service/TowerProjectOrderService.java

@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerProjectOrder;
-import com.gxwebsoft.tower.param.TowerProjectOrderParam;
-
-import java.util.List;
-
-/**
- * 合同签订设备清单Service
- *
- * @author 科技小王子
- * @since 2023-06-07 18:48:56
- */
-public interface TowerProjectOrderService extends IService<TowerProjectOrder> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerProjectOrder>
-     */
-    PageResult<TowerProjectOrder> pageRel(TowerProjectOrderParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerProjectOrder>
-     */
-    List<TowerProjectOrder> listRel(TowerProjectOrderParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param projectOrderId 自增ID
-     * @return TowerProjectOrder
-     */
-    TowerProjectOrder getByIdRel(Integer projectOrderId);
-
-}

src/main/java/com/gxwebsoft/tower/service/TowerProjectPlaceService.java

@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerProjectPlace;
-import com.gxwebsoft.tower.param.TowerProjectPlaceParam;
-
-import java.util.List;
-
-/**
- * 检查/保养部位配置表Service
- *
- * @author 科技小王子
- * @since 2023-06-08 17:22:55
- */
-public interface TowerProjectPlaceService extends IService<TowerProjectPlace> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerProjectPlace>
-     */
-    PageResult<TowerProjectPlace> pageRel(TowerProjectPlaceParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerProjectPlace>
-     */
-    List<TowerProjectPlace> listRel(TowerProjectPlaceParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 自增ID
-     * @return TowerProjectPlace
-     */
-    TowerProjectPlace getByIdRel(Integer id);
-
-}

src/main/java/com/gxwebsoft/tower/service/TowerProjectService.java

@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerProject;
-import com.gxwebsoft.tower.param.TowerProjectParam;
-
-import java.util.List;
-
-/**
- * 项目管理Service
- *
- * @author 科技小王子
- * @since 2023-05-22 13:30:39
- */
-public interface TowerProjectService extends IService<TowerProject> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerProject>
-     */
-    PageResult<TowerProject> pageRel(TowerProjectParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerProject>
-     */
-    List<TowerProject> listRel(TowerProjectParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param projectId 自增ID
-     * @return TowerProject
-     */
-    TowerProject getByIdRel(Integer projectId);
-
-}

src/main/java/com/gxwebsoft/tower/service/TowerProjectUserService.java

@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerProjectUser;
-import com.gxwebsoft.tower.param.TowerProjectUserParam;
-
-import java.util.List;
-
-/**
- * 项目成员Service
- *
- * @author 科技小王子
- * @since 2023-06-07 15:00:32
- */
-public interface TowerProjectUserService extends IService<TowerProjectUser> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerProjectUser>
-     */
-    PageResult<TowerProjectUser> pageRel(TowerProjectUserParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerProjectUser>
-     */
-    List<TowerProjectUser> listRel(TowerProjectUserParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 自增ID
-     * @return TowerProjectUser
-     */
-    TowerProjectUser getByIdRel(Integer id);
-
-}

src/main/java/com/gxwebsoft/tower/service/TowerWarehouseService.java

@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerWarehouse;
-import com.gxwebsoft.tower.param.TowerWarehouseParam;
-
-import java.util.List;
-
-/**
- * 仓库管理Service
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-public interface TowerWarehouseService extends IService<TowerWarehouse> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerWarehouse>
-     */
-    PageResult<TowerWarehouse> pageRel(TowerWarehouseParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerWarehouse>
-     */
-    List<TowerWarehouse> listRel(TowerWarehouseParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param warehouseId 自增ID
-     * @return TowerWarehouse
-     */
-    TowerWarehouse getByIdRel(Integer warehouseId);
-
-}

src/main/java/com/gxwebsoft/tower/service/impl/TowerAccessoryServiceImpl.java

@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerAccessoryMapper;
-import com.gxwebsoft.tower.service.TowerAccessoryService;
-import com.gxwebsoft.tower.entity.TowerAccessory;
-import com.gxwebsoft.tower.param.TowerAccessoryParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 配件管理Service实现
- *
- * @author 科技小王子
- * @since 2023-05-22 11:53:48
- */
-@Service
-public class TowerAccessoryServiceImpl extends ServiceImpl<TowerAccessoryMapper, TowerAccessory> implements TowerAccessoryService {
-
-    @Override
-    public PageResult<TowerAccessory> pageRel(TowerAccessoryParam param) {
-        PageParam<TowerAccessory, TowerAccessoryParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerAccessory> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerAccessory> listRel(TowerAccessoryParam param) {
-        List<TowerAccessory> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerAccessory, TowerAccessoryParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerAccessory getByIdRel(Integer accessoryId) {
-        TowerAccessoryParam param = new TowerAccessoryParam();
-        param.setAccessoryId(accessoryId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}

src/main/java/com/gxwebsoft/tower/service/impl/TowerEquipmentServiceImpl.java

@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerEquipmentMapper;
-import com.gxwebsoft.tower.service.TowerEquipmentService;
-import com.gxwebsoft.tower.entity.TowerEquipment;
-import com.gxwebsoft.tower.param.TowerEquipmentParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 塔吊设备管理Service实现
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-@Service
-public class TowerEquipmentServiceImpl extends ServiceImpl<TowerEquipmentMapper, TowerEquipment> implements TowerEquipmentService {
-
-    @Override
-    public PageResult<TowerEquipment> pageRel(TowerEquipmentParam param) {
-        PageParam<TowerEquipment, TowerEquipmentParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerEquipment> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerEquipment> listRel(TowerEquipmentParam param) {
-        List<TowerEquipment> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerEquipment, TowerEquipmentParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerEquipment getByIdRel(Integer equipmentId) {
-        TowerEquipmentParam param = new TowerEquipmentParam();
-        param.setEquipmentId(equipmentId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}

src/main/java/com/gxwebsoft/tower/service/impl/TowerModelServiceImpl.java

@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerModelMapper;
-import com.gxwebsoft.tower.service.TowerModelService;
-import com.gxwebsoft.tower.entity.TowerModel;
-import com.gxwebsoft.tower.param.TowerModelParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 设备型号管理表Service实现
- *
- * @author 科技小王子
- * @since 2023-05-29 14:07:46
- */
-@Service
-public class TowerModelServiceImpl extends ServiceImpl<TowerModelMapper, TowerModel> implements TowerModelService {
-
-    @Override
-    public PageResult<TowerModel> pageRel(TowerModelParam param) {
-        PageParam<TowerModel, TowerModelParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerModel> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerModel> listRel(TowerModelParam param) {
-        List<TowerModel> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerModel, TowerModelParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerModel getByIdRel(Integer modelId) {
-        TowerModelParam param = new TowerModelParam();
-        param.setModelId(modelId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}

src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceSafetyServiceImpl.java

@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerPlaceSafetyMapper;
-import com.gxwebsoft.tower.service.TowerPlaceSafetyService;
-import com.gxwebsoft.tower.entity.TowerPlaceSafety;
-import com.gxwebsoft.tower.param.TowerPlaceSafetyParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 安全巡检部位管理表Service实现
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-@Service
-public class TowerPlaceSafetyServiceImpl extends ServiceImpl<TowerPlaceSafetyMapper, TowerPlaceSafety> implements TowerPlaceSafetyService {
-
-    @Override
-    public PageResult<TowerPlaceSafety> pageRel(TowerPlaceSafetyParam param) {
-        PageParam<TowerPlaceSafety, TowerPlaceSafetyParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerPlaceSafety> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerPlaceSafety> listRel(TowerPlaceSafetyParam param) {
-        List<TowerPlaceSafety> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerPlaceSafety, TowerPlaceSafetyParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerPlaceSafety getByIdRel(Integer placeSafetyId) {
-        TowerPlaceSafetyParam param = new TowerPlaceSafetyParam();
-        param.setPlaceSafetyId(placeSafetyId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}

src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceServiceImpl.java

@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerPlaceMapper;
-import com.gxwebsoft.tower.service.TowerPlaceService;
-import com.gxwebsoft.tower.entity.TowerPlace;
-import com.gxwebsoft.tower.param.TowerPlaceParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 检查/保养部位记录表Service实现
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-@Service
-public class TowerPlaceServiceImpl extends ServiceImpl<TowerPlaceMapper, TowerPlace> implements TowerPlaceService {
-
-    @Override
-    public PageResult<TowerPlace> pageRel(TowerPlaceParam param) {
-        PageParam<TowerPlace, TowerPlaceParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerPlace> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerPlace> listRel(TowerPlaceParam param) {
-        List<TowerPlace> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerPlace, TowerPlaceParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerPlace getByIdRel(Integer placeId) {
-        TowerPlaceParam param = new TowerPlaceParam();
-        param.setPlaceId(placeId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}

src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceStandardServiceImpl.java

@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerPlaceStandardMapper;
-import com.gxwebsoft.tower.service.TowerPlaceStandardService;
-import com.gxwebsoft.tower.entity.TowerPlaceStandard;
-import com.gxwebsoft.tower.param.TowerPlaceStandardParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 检查标准附件表Service实现
- *
- * @author 科技小王子
- * @since 2023-06-08 15:37:00
- */
-@Service
-public class TowerPlaceStandardServiceImpl extends ServiceImpl<TowerPlaceStandardMapper, TowerPlaceStandard> implements TowerPlaceStandardService {
-
-    @Override
-    public PageResult<TowerPlaceStandard> pageRel(TowerPlaceStandardParam param) {
-        PageParam<TowerPlaceStandard, TowerPlaceStandardParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerPlaceStandard> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerPlaceStandard> listRel(TowerPlaceStandardParam param) {
-        List<TowerPlaceStandard> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerPlaceStandard, TowerPlaceStandardParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerPlaceStandard getByIdRel(Integer id) {
-        TowerPlaceStandardParam param = new TowerPlaceStandardParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}

src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectOrderServiceImpl.java

@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerProjectOrderMapper;
-import com.gxwebsoft.tower.service.TowerProjectOrderService;
-import com.gxwebsoft.tower.entity.TowerProjectOrder;
-import com.gxwebsoft.tower.param.TowerProjectOrderParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 合同签订设备清单Service实现
- *
- * @author 科技小王子
- * @since 2023-06-07 18:48:56
- */
-@Service
-public class TowerProjectOrderServiceImpl extends ServiceImpl<TowerProjectOrderMapper, TowerProjectOrder> implements TowerProjectOrderService {
-
-    @Override
-    public PageResult<TowerProjectOrder> pageRel(TowerProjectOrderParam param) {
-        PageParam<TowerProjectOrder, TowerProjectOrderParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerProjectOrder> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerProjectOrder> listRel(TowerProjectOrderParam param) {
-        List<TowerProjectOrder> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerProjectOrder, TowerProjectOrderParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerProjectOrder getByIdRel(Integer projectOrderId) {
-        TowerProjectOrderParam param = new TowerProjectOrderParam();
-        param.setProjectOrderId(projectOrderId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}

src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectPlaceServiceImpl.java

@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerProjectPlaceMapper;
-import com.gxwebsoft.tower.service.TowerProjectPlaceService;
-import com.gxwebsoft.tower.entity.TowerProjectPlace;
-import com.gxwebsoft.tower.param.TowerProjectPlaceParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 检查/保养部位配置表Service实现
- *
- * @author 科技小王子
- * @since 2023-06-08 17:22:55
- */
-@Service
-public class TowerProjectPlaceServiceImpl extends ServiceImpl<TowerProjectPlaceMapper, TowerProjectPlace> implements TowerProjectPlaceService {
-
-    @Override
-    public PageResult<TowerProjectPlace> pageRel(TowerProjectPlaceParam param) {
-        PageParam<TowerProjectPlace, TowerProjectPlaceParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerProjectPlace> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerProjectPlace> listRel(TowerProjectPlaceParam param) {
-        List<TowerProjectPlace> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerProjectPlace, TowerProjectPlaceParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerProjectPlace getByIdRel(Integer id) {
-        TowerProjectPlaceParam param = new TowerProjectPlaceParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}

src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectServiceImpl.java

@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerProjectMapper;
-import com.gxwebsoft.tower.service.TowerProjectService;
-import com.gxwebsoft.tower.entity.TowerProject;
-import com.gxwebsoft.tower.param.TowerProjectParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 项目管理Service实现
- *
- * @author 科技小王子
- * @since 2023-05-22 13:30:39
- */
-@Service
-public class TowerProjectServiceImpl extends ServiceImpl<TowerProjectMapper, TowerProject> implements TowerProjectService {
-
-    @Override
-    public PageResult<TowerProject> pageRel(TowerProjectParam param) {
-        PageParam<TowerProject, TowerProjectParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerProject> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerProject> listRel(TowerProjectParam param) {
-        List<TowerProject> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerProject, TowerProjectParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerProject getByIdRel(Integer projectId) {
-        TowerProjectParam param = new TowerProjectParam();
-        param.setProjectId(projectId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}

src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectUserServiceImpl.java

@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerProjectUserMapper;
-import com.gxwebsoft.tower.service.TowerProjectUserService;
-import com.gxwebsoft.tower.entity.TowerProjectUser;
-import com.gxwebsoft.tower.param.TowerProjectUserParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 项目成员Service实现
- *
- * @author 科技小王子
- * @since 2023-06-07 15:00:32
- */
-@Service
-public class TowerProjectUserServiceImpl extends ServiceImpl<TowerProjectUserMapper, TowerProjectUser> implements TowerProjectUserService {
-
-    @Override
-    public PageResult<TowerProjectUser> pageRel(TowerProjectUserParam param) {
-        PageParam<TowerProjectUser, TowerProjectUserParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerProjectUser> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerProjectUser> listRel(TowerProjectUserParam param) {
-        List<TowerProjectUser> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerProjectUser, TowerProjectUserParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerProjectUser getByIdRel(Integer id) {
-        TowerProjectUserParam param = new TowerProjectUserParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}

src/main/java/com/gxwebsoft/tower/service/impl/TowerWarehouseServiceImpl.java

@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerWarehouseMapper;
-import com.gxwebsoft.tower.service.TowerWarehouseService;
-import com.gxwebsoft.tower.entity.TowerWarehouse;
-import com.gxwebsoft.tower.param.TowerWarehouseParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 仓库管理Service实现
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-@Service
-public class TowerWarehouseServiceImpl extends ServiceImpl<TowerWarehouseMapper, TowerWarehouse> implements TowerWarehouseService {
-
-    @Override
-    public PageResult<TowerWarehouse> pageRel(TowerWarehouseParam param) {
-        PageParam<TowerWarehouse, TowerWarehouseParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerWarehouse> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerWarehouse> listRel(TowerWarehouseParam param) {
-        List<TowerWarehouse> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerWarehouse, TowerWarehouseParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerWarehouse getByIdRel(Integer warehouseId) {
-        TowerWarehouseParam param = new TowerWarehouseParam();
-        param.setWarehouseId(warehouseId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}

src/main/resources/application-dev.yml

@@ -4,9 +4,9 @@ server:
 # 数据源配置
 spring:
   datasource:
-    url: jdbc:mysql://47.107.122.174:3308/yunxinwei?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://47.107.122.174:13306/yunxinwei?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
     username: yunxinwei
-    password: A56sK6aW2FA3wBy2
+    password: T4xEYiwTdEmS2ZED
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
 #  datasource:

src/main/resources/application-prod.yml

@@ -3,12 +3,18 @@
 # 数据源配置
 spring:
   datasource:
-    url: jdbc:mysql://127.0.0.1:3308/yunxinwei?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://1Panel-mysql-LCaM:3306/yunxinwei?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
     username: yunxinwei
-    password: A56sK6aW2FA3wBy2
+    password: T4xEYiwTdEmS2ZED
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
 
+  redis:
+    database: 7
+    host: 1Panel-redis-CnJa
+    port: 6379
+    password: redis_xGXDip
+
 # 日志配置
 logging:
   file:

src/main/resources/application.yml

@@ -47,9 +47,9 @@ spring:
       max-request-size: 100MB
   redis:
     database: 7
-    host: 127.0.0.1
+    host: 47.107.122.174
-    port: 6379
+    port: 16379
-    password:
+    password: redis_xGXDip
 
   # 邮件服务器配置
   mail:

src/test/java/com/gxwebsoft/generator/HouseGenerator.java

@@ -1,167 +0,0 @@
-package com.gxwebsoft.generator;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.InjectionConfig;
-import com.baomidou.mybatisplus.generator.config.*;
-import com.baomidou.mybatisplus.generator.config.po.TableInfo;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 代码生成工具
- *
- * @author WebSoft
- * @since 2021-09-05 00:31:14
- */
-public class HouseGenerator {
-    // 输出位置
-    private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
-    //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
-    // 输出目录
-    private static final String OUTPUT_DIR = "/src/main/java";
-    // 作者名称
-    private static final String AUTHOR = "科技小王子";
-    // 是否在xml中添加二级缓存配置
-    private static final boolean ENABLE_CACHE = false;
-    // 数据库连接配置
-    private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
-    private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
-    private static final String DB_USERNAME = "com_gxwebsoft_oa";
-    private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw";
-    // 包名
-    private static final String PACKAGE_NAME = "com.gxwebsoft";
-    // 模块名
-    private static final String MODULE_NAME = "house";
-    // 需要生成的表
-    private static final String[] TABLE_NAMES = new String[]{
-              "house_info",
-              "house_reservation"
-    };
-    // 需要去除的表前缀
-    private static final String[] TABLE_PREFIX = new String[]{
-            "house_",
-            "tb_"
-    };
-    // 不需要作为查询参数的字段
-    private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{
-            "tenant_id",
-            "create_time",
-            "update_time"
-    };
-    // 查询参数使用String的类型
-    private static final String[] PARAM_TO_STRING_TYPE = new String[]{
-            "Date",
-            "LocalDate",
-            "LocalTime",
-            "LocalDateTime"
-    };
-    // 查询参数使用EQ的类型
-    private static final String[] PARAM_EQ_TYPE = new String[]{
-            "Integer",
-            "Boolean",
-            "BigDecimal"
-    };
-    // 是否添加权限注解
-    private static final boolean AUTH_ANNOTATION = true;
-    // 是否添加日志注解
-    private static final boolean LOG_ANNOTATION = true;
-    // controller的mapping前缀
-    private static final String CONTROLLER_MAPPING_PREFIX = "/api";
-    // 模板所在位置
-    private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates";
-
-    public static void main(String[] args) {
-        // 代码生成器
-        AutoGenerator mpg = new AutoGenerator();
-
-        // 全局配置
-        GlobalConfig gc = new GlobalConfig();
-        gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR);
-        gc.setAuthor(AUTHOR);
-        gc.setOpen(false);
-        gc.setFileOverride(true);
-        gc.setEnableCache(ENABLE_CACHE);
-        gc.setSwagger2(true);
-        gc.setIdType(IdType.AUTO);
-        gc.setServiceName("%sService");
-        mpg.setGlobalConfig(gc);
-
-        // 数据源配置
-        DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl(DB_URL);
-        // dsc.setSchemaName("public");
-        dsc.setDriverName(DB_DRIVER);
-        dsc.setUsername(DB_USERNAME);
-        dsc.setPassword(DB_PASSWORD);
-        mpg.setDataSource(dsc);
-
-        // 包配置
-        PackageConfig pc = new PackageConfig();
-        pc.setModuleName(MODULE_NAME);
-        pc.setParent(PACKAGE_NAME);
-        mpg.setPackageInfo(pc);
-
-        // 策略配置
-        StrategyConfig strategy = new StrategyConfig();
-        strategy.setNaming(NamingStrategy.underline_to_camel);
-        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
-        strategy.setInclude(TABLE_NAMES);
-        strategy.setTablePrefix(TABLE_PREFIX);
-        strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController");
-        strategy.setEntityLombokModel(true);
-        strategy.setRestControllerStyle(true);
-        strategy.setControllerMappingHyphenStyle(true);
-        strategy.setLogicDeleteFieldName("deleted");
-        mpg.setStrategy(strategy);
-
-        // 模板配置
-        TemplateConfig templateConfig = new TemplateConfig();
-        templateConfig.setController(TEMPLATES_DIR + "/controller.java");
-        templateConfig.setEntity(TEMPLATES_DIR + "/entity.java");
-        templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java");
-        templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml");
-        templateConfig.setService(TEMPLATES_DIR + "/service.java");
-        templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java");
-        mpg.setTemplate(templateConfig);
-        mpg.setTemplateEngine(new BeetlTemplateEnginePlus());
-
-        // 自定义模板配置
-        InjectionConfig cfg = new InjectionConfig() {
-            @Override
-            public void initMap() {
-                Map<String, Object> map = new HashMap<>();
-                map.put("packageName", PACKAGE_NAME);
-                map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS);
-                map.put("paramToStringType", PARAM_TO_STRING_TYPE);
-                map.put("paramEqType", PARAM_EQ_TYPE);
-                map.put("authAnnotation", AUTH_ANNOTATION);
-                map.put("logAnnotation", LOG_ANNOTATION);
-                map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX);
-                this.setMap(map);
-            }
-        };
-        String templatePath = TEMPLATES_DIR + "/param.java.btl";
-        List<FileOutConfig> focList = new ArrayList<>();
-        focList.add(new FileOutConfig(templatePath) {
-            @Override
-            public String outputFile(TableInfo tableInfo) {
-                return OUTPUT_LOCATION + OUTPUT_DIR + "/"
-                        + PACKAGE_NAME.replace(".", "/")
-                        + "/" + pc.getModuleName() + "/param/"
-                        + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA;
-            }
-        });
-        cfg.setFileOutConfigList(focList);
-        mpg.setCfg(cfg);
-
-        mpg.execute();
-    }
-
-}

src/test/java/com/gxwebsoft/generator/LoveGenerator.java

@@ -1,173 +0,0 @@
-package com.gxwebsoft.generator;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.InjectionConfig;
-import com.baomidou.mybatisplus.generator.config.*;
-import com.baomidou.mybatisplus.generator.config.po.TableInfo;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 代码生成工具
- *
- * @author WebSoft
- * @since 2021-09-05 00:31:14
- */
-public class LoveGenerator {
-    // 输出位置
-    private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
-    //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
-    // 输出目录
-    private static final String OUTPUT_DIR = "/src/main/java";
-    // 作者名称
-    private static final String AUTHOR = "科技小王子";
-    // 是否在xml中添加二级缓存配置
-    private static final boolean ENABLE_CACHE = false;
-    // 数据库连接配置
-    private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
-    private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
-    private static final String DB_USERNAME = "com_gxwebsoft_oa";
-    private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw";
-    // 包名
-    private static final String PACKAGE_NAME = "com.gxwebsoft";
-    // 模块名
-    private static final String MODULE_NAME = "love";
-    // 需要生成的表
-    private static final String[] TABLE_NAMES = new String[]{
-//        "love_user_profile",
-//          "love_user_plan",
-//          "love_user_plan_price",
-//          "love_user_plan_log",
-//            "love_user_plan_icon",
-//            "love_user_plan_equity",
-//            "love_certificate",
-              "love_profit"
-    };
-    // 需要去除的表前缀
-    private static final String[] TABLE_PREFIX = new String[]{
-            "love_",
-            "tb_"
-    };
-    // 不需要作为查询参数的字段
-    private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{
-            "tenant_id",
-            "create_time",
-            "update_time"
-    };
-    // 查询参数使用String的类型
-    private static final String[] PARAM_TO_STRING_TYPE = new String[]{
-            "Date",
-            "LocalDate",
-            "LocalTime",
-            "LocalDateTime"
-    };
-    // 查询参数使用EQ的类型
-    private static final String[] PARAM_EQ_TYPE = new String[]{
-            "Integer",
-            "Boolean",
-            "BigDecimal"
-    };
-    // 是否添加权限注解
-    private static final boolean AUTH_ANNOTATION = true;
-    // 是否添加日志注解
-    private static final boolean LOG_ANNOTATION = true;
-    // controller的mapping前缀
-    private static final String CONTROLLER_MAPPING_PREFIX = "/api";
-    // 模板所在位置
-    private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates";
-
-    public static void main(String[] args) {
-        // 代码生成器
-        AutoGenerator mpg = new AutoGenerator();
-
-        // 全局配置
-        GlobalConfig gc = new GlobalConfig();
-        gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR);
-        gc.setAuthor(AUTHOR);
-        gc.setOpen(false);
-        gc.setFileOverride(true);
-        gc.setEnableCache(ENABLE_CACHE);
-        gc.setSwagger2(true);
-        gc.setIdType(IdType.AUTO);
-        gc.setServiceName("%sService");
-        mpg.setGlobalConfig(gc);
-
-        // 数据源配置
-        DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl(DB_URL);
-        // dsc.setSchemaName("public");
-        dsc.setDriverName(DB_DRIVER);
-        dsc.setUsername(DB_USERNAME);
-        dsc.setPassword(DB_PASSWORD);
-        mpg.setDataSource(dsc);
-
-        // 包配置
-        PackageConfig pc = new PackageConfig();
-        pc.setModuleName(MODULE_NAME);
-        pc.setParent(PACKAGE_NAME);
-        mpg.setPackageInfo(pc);
-
-        // 策略配置
-        StrategyConfig strategy = new StrategyConfig();
-        strategy.setNaming(NamingStrategy.underline_to_camel);
-        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
-        strategy.setInclude(TABLE_NAMES);
-        strategy.setTablePrefix(TABLE_PREFIX);
-        strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController");
-        strategy.setEntityLombokModel(true);
-        strategy.setRestControllerStyle(true);
-        strategy.setControllerMappingHyphenStyle(true);
-        strategy.setLogicDeleteFieldName("deleted");
-        mpg.setStrategy(strategy);
-
-        // 模板配置
-        TemplateConfig templateConfig = new TemplateConfig();
-        templateConfig.setController(TEMPLATES_DIR + "/controller.java");
-        templateConfig.setEntity(TEMPLATES_DIR + "/entity.java");
-        templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java");
-        templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml");
-        templateConfig.setService(TEMPLATES_DIR + "/service.java");
-        templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java");
-        mpg.setTemplate(templateConfig);
-        mpg.setTemplateEngine(new BeetlTemplateEnginePlus());
-
-        // 自定义模板配置
-        InjectionConfig cfg = new InjectionConfig() {
-            @Override
-            public void initMap() {
-                Map<String, Object> map = new HashMap<>();
-                map.put("packageName", PACKAGE_NAME);
-                map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS);
-                map.put("paramToStringType", PARAM_TO_STRING_TYPE);
-                map.put("paramEqType", PARAM_EQ_TYPE);
-                map.put("authAnnotation", AUTH_ANNOTATION);
-                map.put("logAnnotation", LOG_ANNOTATION);
-                map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX);
-                this.setMap(map);
-            }
-        };
-        String templatePath = TEMPLATES_DIR + "/param.java.btl";
-        List<FileOutConfig> focList = new ArrayList<>();
-        focList.add(new FileOutConfig(templatePath) {
-            @Override
-            public String outputFile(TableInfo tableInfo) {
-                return OUTPUT_LOCATION + OUTPUT_DIR + "/"
-                        + PACKAGE_NAME.replace(".", "/")
-                        + "/" + pc.getModuleName() + "/param/"
-                        + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA;
-            }
-        });
-        cfg.setFileOutConfigList(focList);
-        mpg.setCfg(cfg);
-
-        mpg.execute();
-    }
-
-}

src/test/java/com/gxwebsoft/generator/OaGenerator.java

@@ -1,180 +0,0 @@
-package com.gxwebsoft.generator;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.InjectionConfig;
-import com.baomidou.mybatisplus.generator.config.*;
-import com.baomidou.mybatisplus.generator.config.po.TableInfo;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 代码生成工具
- *
- * @author WebSoft
- * @since 2021-09-05 00:31:14
- */
-public class OaGenerator {
-    // 输出位置
-    private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
-    //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
-    // 输出目录
-    private static final String OUTPUT_DIR = "/src/main/java";
-    // 作者名称
-    private static final String AUTHOR = "科技小王子";
-    // 是否在xml中添加二级缓存配置
-    private static final boolean ENABLE_CACHE = false;
-    // 数据库连接配置
-    private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
-    private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
-    private static final String DB_USERNAME = "com_gxwebsoft_oa";
-    private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw";
-    // 包名
-    private static final String PACKAGE_NAME = "com.gxwebsoft";
-    // 模块名
-    private static final String MODULE_NAME = "oa";
-    // 需要生成的表
-    private static final String[] TABLE_NAMES = new String[]{
-//      "oa_project",
-//      "oa_link",
-//      "oa_assets",
-//      "oa_customer",
-//      "oa_task",
-//      "oa_task_record",
-//      "oa_task_user",
-//      "sys_tenant",
-//      "oa_app",
-//      "oa_setting",
-//      "oa_assets",
-//      "oa_app_user",
-//      "oa_notice"
-      "oa_assets_user",
-
-    };
-    // 需要去除的表前缀
-    private static final String[] TABLE_PREFIX = new String[]{
-            "oa_",
-            "tb_"
-    };
-    // 不需要作为查询参数的字段
-    private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{
-            "tenant_id",
-            "create_time",
-            "update_time"
-    };
-    // 查询参数使用String的类型
-    private static final String[] PARAM_TO_STRING_TYPE = new String[]{
-            "Date",
-            "LocalDate",
-            "LocalTime",
-            "LocalDateTime"
-    };
-    // 查询参数使用EQ的类型
-    private static final String[] PARAM_EQ_TYPE = new String[]{
-            "Integer",
-            "Boolean",
-            "BigDecimal"
-    };
-    // 是否添加权限注解
-    private static final boolean AUTH_ANNOTATION = true;
-    // 是否添加日志注解
-    private static final boolean LOG_ANNOTATION = true;
-    // controller的mapping前缀
-    private static final String CONTROLLER_MAPPING_PREFIX = "/api";
-    // 模板所在位置
-    private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates";
-
-    public static void main(String[] args) {
-        // 代码生成器
-        AutoGenerator mpg = new AutoGenerator();
-
-        // 全局配置
-        GlobalConfig gc = new GlobalConfig();
-        gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR);
-        gc.setAuthor(AUTHOR);
-        gc.setOpen(false);
-        gc.setFileOverride(true);
-        gc.setEnableCache(ENABLE_CACHE);
-        gc.setSwagger2(true);
-        gc.setIdType(IdType.AUTO);
-        gc.setServiceName("%sService");
-        mpg.setGlobalConfig(gc);
-
-        // 数据源配置
-        DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl(DB_URL);
-        // dsc.setSchemaName("public");
-        dsc.setDriverName(DB_DRIVER);
-        dsc.setUsername(DB_USERNAME);
-        dsc.setPassword(DB_PASSWORD);
-        mpg.setDataSource(dsc);
-
-        // 包配置
-        PackageConfig pc = new PackageConfig();
-        pc.setModuleName(MODULE_NAME);
-        pc.setParent(PACKAGE_NAME);
-        mpg.setPackageInfo(pc);
-
-        // 策略配置
-        StrategyConfig strategy = new StrategyConfig();
-        strategy.setNaming(NamingStrategy.underline_to_camel);
-        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
-        strategy.setInclude(TABLE_NAMES);
-        strategy.setTablePrefix(TABLE_PREFIX);
-        strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController");
-        strategy.setEntityLombokModel(true);
-        strategy.setRestControllerStyle(true);
-        strategy.setControllerMappingHyphenStyle(true);
-        strategy.setLogicDeleteFieldName("deleted");
-        mpg.setStrategy(strategy);
-
-        // 模板配置
-        TemplateConfig templateConfig = new TemplateConfig();
-        templateConfig.setController(TEMPLATES_DIR + "/controller.java");
-        templateConfig.setEntity(TEMPLATES_DIR + "/entity.java");
-        templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java");
-        templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml");
-        templateConfig.setService(TEMPLATES_DIR + "/service.java");
-        templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java");
-        mpg.setTemplate(templateConfig);
-        mpg.setTemplateEngine(new BeetlTemplateEnginePlus());
-
-        // 自定义模板配置
-        InjectionConfig cfg = new InjectionConfig() {
-            @Override
-            public void initMap() {
-                Map<String, Object> map = new HashMap<>();
-                map.put("packageName", PACKAGE_NAME);
-                map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS);
-                map.put("paramToStringType", PARAM_TO_STRING_TYPE);
-                map.put("paramEqType", PARAM_EQ_TYPE);
-                map.put("authAnnotation", AUTH_ANNOTATION);
-                map.put("logAnnotation", LOG_ANNOTATION);
-                map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX);
-                this.setMap(map);
-            }
-        };
-        String templatePath = TEMPLATES_DIR + "/param.java.btl";
-        List<FileOutConfig> focList = new ArrayList<>();
-        focList.add(new FileOutConfig(templatePath) {
-            @Override
-            public String outputFile(TableInfo tableInfo) {
-                return OUTPUT_LOCATION + OUTPUT_DIR + "/"
-                        + PACKAGE_NAME.replace(".", "/")
-                        + "/" + pc.getModuleName() + "/param/"
-                        + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA;
-            }
-        });
-        cfg.setFileOutConfigList(focList);
-        mpg.setCfg(cfg);
-
-        mpg.execute();
-    }
-
-}

src/test/java/com/gxwebsoft/generator/TowerGenerator.java

@@ -1,176 +0,0 @@
-package com.gxwebsoft.generator;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.InjectionConfig;
-import com.baomidou.mybatisplus.generator.config.*;
-import com.baomidou.mybatisplus.generator.config.po.TableInfo;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 代码生成工具
- *
- * @author WebSoft
- * @since 2021-09-05 00:31:14
- */
-public class TowerGenerator {
-    // 输出位置
-    private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
-    //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
-    // 输出目录
-    private static final String OUTPUT_DIR = "/src/main/java";
-    // 作者名称
-    private static final String AUTHOR = "科技小王子";
-    // 是否在xml中添加二级缓存配置
-    private static final boolean ENABLE_CACHE = false;
-    // 数据库连接配置
-    private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
-    private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
-    private static final String DB_USERNAME = "com_gxwebsoft_oa";
-    private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw";
-    // 包名
-    private static final String PACKAGE_NAME = "com.gxwebsoft";
-    // 模块名
-    private static final String MODULE_NAME = "tower";
-    // 需要生成的表
-    private static final String[] TABLE_NAMES = new String[]{
-//      "tower_equipment",
-//      "tower_warehouse",
-//      "tower_accessory"
-//      "tower_project",
-//      "tower_model",
-//      "tower_project_user",
-//        "tower_project_order",
-//        "tower_place",
-//        "tower_place_safety",
-//        "tower_place_standard",
-        "tower_project_place"
-    };
-    // 需要去除的表前缀
-    private static final String[] TABLE_PREFIX = new String[]{
-            "sys_",
-            "tb_"
-    };
-    // 不需要作为查询参数的字段
-    private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{
-            "tenant_id",
-            "create_time",
-            "update_time"
-    };
-    // 查询参数使用String的类型
-    private static final String[] PARAM_TO_STRING_TYPE = new String[]{
-            "Date",
-            "LocalDate",
-            "LocalTime",
-            "LocalDateTime"
-    };
-    // 查询参数使用EQ的类型
-    private static final String[] PARAM_EQ_TYPE = new String[]{
-            "Integer",
-            "Boolean",
-            "BigDecimal"
-    };
-    // 是否添加权限注解
-    private static final boolean AUTH_ANNOTATION = true;
-    // 是否添加日志注解
-    private static final boolean LOG_ANNOTATION = true;
-    // controller的mapping前缀
-    private static final String CONTROLLER_MAPPING_PREFIX = "/api";
-    // 模板所在位置
-    private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates";
-
-    public static void main(String[] args) {
-        // 代码生成器
-        AutoGenerator mpg = new AutoGenerator();
-
-        // 全局配置
-        GlobalConfig gc = new GlobalConfig();
-        gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR);
-        gc.setAuthor(AUTHOR);
-        gc.setOpen(false);
-        gc.setFileOverride(true);
-        gc.setEnableCache(ENABLE_CACHE);
-        gc.setSwagger2(true);
-        gc.setIdType(IdType.AUTO);
-        gc.setServiceName("%sService");
-        mpg.setGlobalConfig(gc);
-
-        // 数据源配置
-        DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl(DB_URL);
-        // dsc.setSchemaName("public");
-        dsc.setDriverName(DB_DRIVER);
-        dsc.setUsername(DB_USERNAME);
-        dsc.setPassword(DB_PASSWORD);
-        mpg.setDataSource(dsc);
-
-        // 包配置
-        PackageConfig pc = new PackageConfig();
-        pc.setModuleName(MODULE_NAME);
-        pc.setParent(PACKAGE_NAME);
-        mpg.setPackageInfo(pc);
-
-        // 策略配置
-        StrategyConfig strategy = new StrategyConfig();
-        strategy.setNaming(NamingStrategy.underline_to_camel);
-        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
-        strategy.setInclude(TABLE_NAMES);
-        strategy.setTablePrefix(TABLE_PREFIX);
-        strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController");
-        strategy.setEntityLombokModel(true);
-        strategy.setRestControllerStyle(true);
-        strategy.setControllerMappingHyphenStyle(true);
-        strategy.setLogicDeleteFieldName("deleted");
-        mpg.setStrategy(strategy);
-
-        // 模板配置
-        TemplateConfig templateConfig = new TemplateConfig();
-        templateConfig.setController(TEMPLATES_DIR + "/controller.java");
-        templateConfig.setEntity(TEMPLATES_DIR + "/entity.java");
-        templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java");
-        templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml");
-        templateConfig.setService(TEMPLATES_DIR + "/service.java");
-        templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java");
-        mpg.setTemplate(templateConfig);
-        mpg.setTemplateEngine(new BeetlTemplateEnginePlus());
-
-        // 自定义模板配置
-        InjectionConfig cfg = new InjectionConfig() {
-            @Override
-            public void initMap() {
-                Map<String, Object> map = new HashMap<>();
-                map.put("packageName", PACKAGE_NAME);
-                map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS);
-                map.put("paramToStringType", PARAM_TO_STRING_TYPE);
-                map.put("paramEqType", PARAM_EQ_TYPE);
-                map.put("authAnnotation", AUTH_ANNOTATION);
-                map.put("logAnnotation", LOG_ANNOTATION);
-                map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX);
-                this.setMap(map);
-            }
-        };
-        String templatePath = TEMPLATES_DIR + "/param.java.btl";
-        List<FileOutConfig> focList = new ArrayList<>();
-        focList.add(new FileOutConfig(templatePath) {
-            @Override
-            public String outputFile(TableInfo tableInfo) {
-                return OUTPUT_LOCATION + OUTPUT_DIR + "/"
-                        + PACKAGE_NAME.replace(".", "/")
-                        + "/" + pc.getModuleName() + "/param/"
-                        + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA;
-            }
-        });
-        cfg.setFileOutConfigList(focList);
-        mpg.setCfg(cfg);
-
-        mpg.execute();
-    }
-
-}