diff --git a/dump.rdb b/dump.rdb new file mode 100644 index 0000000..c0cb046 Binary files /dev/null and b/dump.rdb differ diff --git a/src/main/java/com/gxwebsoft/oa/service/impl/IdcardServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/IdcardServiceImpl.java index 725981a..4896cf8 100644 --- a/src/main/java/com/gxwebsoft/oa/service/impl/IdcardServiceImpl.java +++ b/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(); + errorResp.setCode("OCR_ERROR"); + errorResp.setMessage("身份证识别服务暂不可用，请稍后重试"); + return errorResp; } - - return null; } } diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java b/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java index 58310e2..819be2d 100644 --- a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java +++ b/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())) { - return fail("请上传身份证正面照片." + verify.getMessage() + verify.getCode()); + if(verify == null || !"FP00000".equals(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("请上传身份证反面照片"); diff --git a/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java b/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java index 34cb840..372127b 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java +++ b/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 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); diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerAccessoryController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerAccessoryController.java deleted file mode 100644 index 831beba..0000000 --- a/src/main/java/com/gxwebsoft/tower/controller/TowerAccessoryController.java +++ /dev/null @@ -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> page(TowerAccessoryParam param) { - // 使用关联查询 - return success(towerAccessoryService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('tower:towerAccessory:list')") - @OperationLog - @ApiOperation("查询全部配件管理") - @GetMapping() - public ApiResult> list(TowerAccessoryParam param) { - // 使用关联查询 - return success(towerAccessoryService.listRel(param)); - } - - @PreAuthorize("hasAuthority('tower:towerAccessory:list')") - @OperationLog - @ApiOperation("根据id查询配件管理") - @GetMapping("/{id}") - public ApiResult 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 list) { - if (towerAccessoryService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('tower:towerAccessory:update')") - @OperationLog - @ApiOperation("批量修改配件管理") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam 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 ids) { - if (towerAccessoryService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerEquipmentController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerEquipmentController.java deleted file mode 100644 index 0830015..0000000 --- a/src/main/java/com/gxwebsoft/tower/controller/TowerEquipmentController.java +++ /dev/null @@ -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> page(TowerEquipmentParam param) { - // 使用关联查询 - return success(towerEquipmentService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('tower:towerEquipment:list')") - @OperationLog - @ApiOperation("查询全部塔吊设备管理") - @GetMapping() - public ApiResult> list(TowerEquipmentParam param) { - // 使用关联查询 - return success(towerEquipmentService.listRel(param)); - } - - @PreAuthorize("hasAuthority('tower:towerEquipment:list')") - @OperationLog - @ApiOperation("根据id查询塔吊设备管理") - @GetMapping("/{id}") - public ApiResult 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 list) { - if (towerEquipmentService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('tower:towerEquipment:update')") - @OperationLog - @ApiOperation("批量修改塔吊设备管理") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam 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 ids) { - if (towerEquipmentService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('tower:towerEquipment:update')") - @OperationLog - @ApiOperation("批量修改塔吊设备状态") - @PutMapping("/status") - public ApiResult statusBatch(@RequestBody List batchParam) { - if (towerEquipmentService.updateBatchById(batchParam)) { - return success("修改成功"); - } - return fail("修改失败"); - } -} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerModelController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerModelController.java deleted file mode 100644 index caea15d..0000000 --- a/src/main/java/com/gxwebsoft/tower/controller/TowerModelController.java +++ /dev/null @@ -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> page(TowerModelParam param) { - // 使用关联查询 - return success(towerModelService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('tower:towerModel:list')") - @OperationLog - @ApiOperation("查询全部设备型号管理表") - @GetMapping() - public ApiResult> list(TowerModelParam param) { - // 使用关联查询 - return success(towerModelService.listRel(param)); - } - - @PreAuthorize("hasAuthority('tower:towerModel:list')") - @OperationLog - @ApiOperation("根据id查询设备型号管理表") - @GetMapping("/{id}") - public ApiResult 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 list) { - if (towerModelService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('tower:towerModel:update')") - @OperationLog - @ApiOperation("批量修改设备型号管理表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam 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 ids) { - if (towerModelService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceController.java deleted file mode 100644 index 033aa73..0000000 --- a/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceController.java +++ /dev/null @@ -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> page(TowerPlaceParam param) { - PageParam 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(TowerPlaceParam param) { - PageParam 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 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 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 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().eq(TowerPlaceStandard::getPlaceId,id)); - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('tower:towerPlace:save')") - @OperationLog - @ApiOperation("批量添加检查/保养部位记录表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (towerPlaceService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('tower:towerPlace:update')") - @OperationLog - @ApiOperation("批量修改检查/保养部位记录表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam 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 ids) { - if (towerPlaceService.removeByIds(ids)) { - for (Integer id: ids){ - towerPlaceStandardService.remove(new LambdaQueryWrapper().eq(TowerPlaceStandard::getPlaceId,id)); - } - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceSafetyController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceSafetyController.java deleted file mode 100644 index c2e01dc..0000000 --- a/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceSafetyController.java +++ /dev/null @@ -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> page(TowerPlaceSafetyParam param) { - PageParam 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(TowerPlaceSafetyParam param) { - PageParam 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 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 list) { - if (towerPlaceSafetyService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('tower:towerPlaceSafety:update')") - @OperationLog - @ApiOperation("批量修改安全巡检部位管理表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam 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 ids) { - if (towerPlaceSafetyService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceStandardController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceStandardController.java deleted file mode 100644 index 62397ba..0000000 --- a/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceStandardController.java +++ /dev/null @@ -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> page(TowerPlaceStandardParam param) { - PageParam 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(TowerPlaceStandardParam param) { - PageParam 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 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 list) { - if (towerPlaceStandardService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('tower:towerPlaceStandard:update')") - @OperationLog - @ApiOperation("批量修改检查标准附件表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(towerPlaceStandardService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('tower:towerPlaceStandard:remove')") - @OperationLog - @ApiOperation("批量删除检查标准附件表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (towerPlaceStandardService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerProjectController.java deleted file mode 100644 index 6bfe7bf..0000000 --- a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectController.java +++ /dev/null @@ -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> page(TowerProjectParam param) { - // 使用关联查询 - return success(towerProjectService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('tower:towerProject:list')") - @ApiOperation("查询全部项目管理") - @GetMapping() - public ApiResult> list(TowerProjectParam param) { - // 使用关联查询 - return success(towerProjectService.listRel(param)); - } - - @PreAuthorize("hasAuthority('tower:towerProject:list')") - @ApiOperation("根据id查询项目管理") - @GetMapping("/{id}") - public ApiResult 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 users = towerProject.getUsers(); - users.forEach(d->{ - d.setProjectId(projectId); - }); - towerProjectUserService.saveBatch(users); - } - // 批量添加项目订单 - if (!towerProject.getOrders().isEmpty()) { - final Set orders = towerProject.getOrders(); - orders.forEach(d->{ - d.setProjectId(projectId); - }); - towerProjectOrderService.saveBatch(orders); - } - // 批量添加检查部位配置 - if (!towerProject.getPlaces1().isEmpty()) { - final Set places1 = towerProject.getPlaces1(); - places1.forEach(d->{ - d.setProjectId(projectId); - }); - towerProjectPlaceService.saveBatch(places1); - } - // 批量添加保养部位配置 - if (!towerProject.getPlaces2().isEmpty()) { - final Set 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 list) { - if (towerProjectService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('tower:towerProject:update')") - @ApiOperation("批量修改项目管理") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam 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 ids) { - if (towerProjectService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectOrderController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerProjectOrderController.java deleted file mode 100644 index 870010d..0000000 --- a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectOrderController.java +++ /dev/null @@ -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> page(TowerProjectOrderParam param) { - // 使用关联查询 - return success(towerProjectOrderService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('tower:towerProjectOrder:list')") - @OperationLog - @ApiOperation("查询全部合同签订设备清单") - @GetMapping() - public ApiResult> list(TowerProjectOrderParam param) { - // 使用关联查询 - return success(towerProjectOrderService.listRel(param)); - } - - @PreAuthorize("hasAuthority('tower:towerProjectOrder:list')") - @OperationLog - @ApiOperation("根据id查询合同签订设备清单") - @GetMapping("/{id}") - public ApiResult 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 list) { - if (towerProjectOrderService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('tower:towerProjectOrder:update')") - @OperationLog - @ApiOperation("批量修改合同签订设备清单") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam 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 ids) { - if (towerProjectOrderService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectPlaceController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerProjectPlaceController.java deleted file mode 100644 index f634be0..0000000 --- a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectPlaceController.java +++ /dev/null @@ -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> page(TowerProjectPlaceParam param) { - // 使用关联查询 - return success(towerProjectPlaceService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('tower:towerProjectPlace:list')") - @OperationLog - @ApiOperation("查询全部检查/保养部位配置表") - @GetMapping() - public ApiResult> list(TowerProjectPlaceParam param) { - // 使用关联查询 - return success(towerProjectPlaceService.listRel(param)); - } - - @PreAuthorize("hasAuthority('tower:towerProjectPlace:list')") - @OperationLog - @ApiOperation("根据id查询检查/保养部位配置表") - @GetMapping("/{id}") - public ApiResult 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() - .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 list) { - if (towerProjectPlaceService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('tower:towerProjectPlace:update')") - @OperationLog - @ApiOperation("批量修改检查/保养部位配置表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(towerProjectPlaceService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('tower:towerProjectPlace:remove')") - @OperationLog - @ApiOperation("批量删除检查/保养部位配置表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (towerProjectPlaceService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectUserController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerProjectUserController.java deleted file mode 100644 index 6eaafde..0000000 --- a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectUserController.java +++ /dev/null @@ -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> page(TowerProjectUserParam param) { - // 使用关联查询 - return success(towerProjectUserService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('tower:towerProjectUser:list')") - @OperationLog - @ApiOperation("查询全部项目成员") - @GetMapping() - public ApiResult> list(TowerProjectUserParam param) { - // 使用关联查询 - return success(towerProjectUserService.listRel(param)); - } - - @PreAuthorize("hasAuthority('tower:towerProjectUser:list')") - @OperationLog - @ApiOperation("根据id查询项目成员") - @GetMapping("/{id}") - public ApiResult 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() - .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 list) { - if (towerProjectUserService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('tower:towerProjectUser:update')") - @OperationLog - @ApiOperation("批量修改项目成员") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(towerProjectUserService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('tower:towerProjectUser:remove')") - @OperationLog - @ApiOperation("批量删除项目成员") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (towerProjectUserService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerWarehouseController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerWarehouseController.java deleted file mode 100644 index c2db02b..0000000 --- a/src/main/java/com/gxwebsoft/tower/controller/TowerWarehouseController.java +++ /dev/null @@ -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> page(TowerWarehouseParam param) { - // 使用关联查询 - return success(towerWarehouseService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('tower:towerWarehouse:list')") - @OperationLog - @ApiOperation("查询全部仓库管理") - @GetMapping() - public ApiResult> list(TowerWarehouseParam param) { - // 使用关联查询 - return success(towerWarehouseService.listRel(param)); - } - - @PreAuthorize("hasAuthority('tower:towerWarehouse:list')") - @OperationLog - @ApiOperation("根据id查询仓库管理") - @GetMapping("/{id}") - public ApiResult 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 list) { - if (towerWarehouseService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('tower:towerWarehouse:update')") - @OperationLog - @ApiOperation("批量修改仓库管理") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam 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 ids) { - if (towerWarehouseService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerAccessory.java b/src/main/java/com/gxwebsoft/tower/entity/TowerAccessory.java deleted file mode 100644 index 6c15a05..0000000 --- a/src/main/java/com/gxwebsoft/tower/entity/TowerAccessory.java +++ /dev/null @@ -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; - -} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerEquipment.java b/src/main/java/com/gxwebsoft/tower/entity/TowerEquipment.java deleted file mode 100644 index e0845ff..0000000 --- a/src/main/java/com/gxwebsoft/tower/entity/TowerEquipment.java +++ /dev/null @@ -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; - -} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerModel.java b/src/main/java/com/gxwebsoft/tower/entity/TowerModel.java deleted file mode 100644 index 6db1559..0000000 --- a/src/main/java/com/gxwebsoft/tower/entity/TowerModel.java +++ /dev/null @@ -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; - -} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerPlace.java b/src/main/java/com/gxwebsoft/tower/entity/TowerPlace.java deleted file mode 100644 index f73da0b..0000000 --- a/src/main/java/com/gxwebsoft/tower/entity/TowerPlace.java +++ /dev/null @@ -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 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; - -} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerPlaceSafety.java b/src/main/java/com/gxwebsoft/tower/entity/TowerPlaceSafety.java deleted file mode 100644 index 770406a..0000000 --- a/src/main/java/com/gxwebsoft/tower/entity/TowerPlaceSafety.java +++ /dev/null @@ -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; - -} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerPlaceStandard.java b/src/main/java/com/gxwebsoft/tower/entity/TowerPlaceStandard.java deleted file mode 100644 index cca3230..0000000 --- a/src/main/java/com/gxwebsoft/tower/entity/TowerPlaceStandard.java +++ /dev/null @@ -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; - -} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerProject.java b/src/main/java/com/gxwebsoft/tower/entity/TowerProject.java deleted file mode 100644 index ddfb3e6..0000000 --- a/src/main/java/com/gxwebsoft/tower/entity/TowerProject.java +++ /dev/null @@ -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 users; - - @ApiModelProperty(value = "合同预定设备清单") - @TableField(exist = false) - private Set orders; - - @ApiModelProperty(value = "检查部位配置") - @TableField(exist = false) - private Set places1; - - @ApiModelProperty(value = "保养部位配置") - @TableField(exist = false) - private Set places2; - -} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerProjectOrder.java b/src/main/java/com/gxwebsoft/tower/entity/TowerProjectOrder.java deleted file mode 100644 index 3a09d0e..0000000 --- a/src/main/java/com/gxwebsoft/tower/entity/TowerProjectOrder.java +++ /dev/null @@ -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; - -} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerProjectPlace.java b/src/main/java/com/gxwebsoft/tower/entity/TowerProjectPlace.java deleted file mode 100644 index c79412f..0000000 --- a/src/main/java/com/gxwebsoft/tower/entity/TowerProjectPlace.java +++ /dev/null @@ -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; -} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerProjectUser.java b/src/main/java/com/gxwebsoft/tower/entity/TowerProjectUser.java deleted file mode 100644 index 129b289..0000000 --- a/src/main/java/com/gxwebsoft/tower/entity/TowerProjectUser.java +++ /dev/null @@ -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; - -} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerWarehouse.java b/src/main/java/com/gxwebsoft/tower/entity/TowerWarehouse.java deleted file mode 100644 index b4a15ca..0000000 --- a/src/main/java/com/gxwebsoft/tower/entity/TowerWarehouse.java +++ /dev/null @@ -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; - -} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerAccessoryMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerAccessoryMapper.java deleted file mode 100644 index b57c669..0000000 --- a/src/main/java/com/gxwebsoft/tower/mapper/TowerAccessoryMapper.java +++ /dev/null @@ -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 { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") TowerAccessoryParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") TowerAccessoryParam param); - -} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerEquipmentMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerEquipmentMapper.java deleted file mode 100644 index 6ca0886..0000000 --- a/src/main/java/com/gxwebsoft/tower/mapper/TowerEquipmentMapper.java +++ /dev/null @@ -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 { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") TowerEquipmentParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") TowerEquipmentParam param); - -} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerModelMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerModelMapper.java deleted file mode 100644 index d483b6c..0000000 --- a/src/main/java/com/gxwebsoft/tower/mapper/TowerModelMapper.java +++ /dev/null @@ -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 { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") TowerModelParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") TowerModelParam param); - -} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceMapper.java deleted file mode 100644 index df44d63..0000000 --- a/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceMapper.java +++ /dev/null @@ -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 { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") TowerPlaceParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") TowerPlaceParam param); - -} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceSafetyMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceSafetyMapper.java deleted file mode 100644 index bd1fd3c..0000000 --- a/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceSafetyMapper.java +++ /dev/null @@ -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 { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") TowerPlaceSafetyParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") TowerPlaceSafetyParam param); - -} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceStandardMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceStandardMapper.java deleted file mode 100644 index df9460f..0000000 --- a/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceStandardMapper.java +++ /dev/null @@ -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 { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") TowerPlaceStandardParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") TowerPlaceStandardParam param); - -} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectMapper.java deleted file mode 100644 index b1002e6..0000000 --- a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectMapper.java +++ /dev/null @@ -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 { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") TowerProjectParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") TowerProjectParam param); - -} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectOrderMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectOrderMapper.java deleted file mode 100644 index c942a9a..0000000 --- a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectOrderMapper.java +++ /dev/null @@ -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 { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") TowerProjectOrderParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") TowerProjectOrderParam param); - -} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectPlaceMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectPlaceMapper.java deleted file mode 100644 index 6cd19d0..0000000 --- a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectPlaceMapper.java +++ /dev/null @@ -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 { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") TowerProjectPlaceParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") TowerProjectPlaceParam param); - -} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectUserMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectUserMapper.java deleted file mode 100644 index 1adb753..0000000 --- a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectUserMapper.java +++ /dev/null @@ -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 { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") TowerProjectUserParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") TowerProjectUserParam param); - -} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerWarehouseMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerWarehouseMapper.java deleted file mode 100644 index 6a92b52..0000000 --- a/src/main/java/com/gxwebsoft/tower/mapper/TowerWarehouseMapper.java +++ /dev/null @@ -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 { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") TowerWarehouseParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") TowerWarehouseParam param); - -} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerAccessoryMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerAccessoryMapper.xml deleted file mode 100644 index 6c49f5e..0000000 --- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerAccessoryMapper.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - SELECT a.* - FROM tower_accessory a - - - AND a.accessory_id = #{param.accessoryId} - - - AND a.accessory_name LIKE CONCAT('%', #{param.accessoryName}, '%') - - - AND a.accessory_category LIKE CONCAT('%', #{param.accessoryCategory}, '%') - - - AND a.accessory_model LIKE CONCAT('%', #{param.accessoryModel}, '%') - - - AND a.accessory_specs LIKE CONCAT('%', #{param.accessorySpecs}, '%') - - - AND a.accessory_price = #{param.accessoryPrice} - - - AND a.accessory_unit LIKE CONCAT('%', #{param.accessoryUnit}, '%') - - - AND a.accessory_stock LIKE CONCAT('%', #{param.accessoryStock}, '%') - - - AND a.company_name LIKE CONCAT('%', #{param.companyName}, '%') - - - AND a.manufactor LIKE CONCAT('%', #{param.manufactor}, '%') - - - AND a.manufactor_no LIKE CONCAT('%', #{param.manufactorNo}, '%') - - - AND a.life_year LIKE CONCAT('%', #{param.lifeYear}, '%') - - - AND a.factory_date LIKE CONCAT('%', #{param.factoryDate}, '%') - - - AND a.scrap_date LIKE CONCAT('%', #{param.scrapDate}, '%') - - - AND a.status = #{param.status} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.user_id = #{param.userId} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND ( - a.accessory_name LIKE CONCAT('%', #{param.keywords}, '%') - OR a.accessory_no LIKE CONCAT('%', #{param.keywords}, '%') - OR a.company_name LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerEquipmentMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerEquipmentMapper.xml deleted file mode 100644 index c7a2c93..0000000 --- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerEquipmentMapper.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - SELECT a.* - FROM tower_equipment a - - - AND a.equipment_id = #{param.equipmentId} - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.model LIKE CONCAT('%', #{param.model}, '%') - - - AND a.equipment_no LIKE CONCAT('%', #{param.equipmentNo}, '%') - - - AND a.factory_no LIKE CONCAT('%', #{param.factoryNo}, '%') - - - AND a.factory_date LIKE CONCAT('%', #{param.factoryDate}, '%') - - - AND a.manufactor LIKE CONCAT('%', #{param.manufactor}, '%') - - - AND a.life_year LIKE CONCAT('%', #{param.lifeYear}, '%') - - - AND a.scrap_date LIKE CONCAT('%', #{param.scrapDate}, '%') - - - AND a.licence_no LIKE CONCAT('%', #{param.licenceNo}, '%') - - - AND a.company = #{param.company} - - - AND a.organization = #{param.organization} - - - AND a.warehouse = #{param.warehouse} - - - AND a.source LIKE CONCAT('%', #{param.source}, '%') - - - AND a.buy_date LIKE CONCAT('%', #{param.buyDate}, '%') - - - AND a.current_location LIKE CONCAT('%', #{param.currentLocation}, '%') - - - AND a.design_height LIKE CONCAT('%', #{param.designHeight}, '%') - - - AND a.height LIKE CONCAT('%', #{param.height}, '%') - - - AND a.rated_load LIKE CONCAT('%', #{param.ratedLoad}, '%') - - - AND a.max_rated_load LIKE CONCAT('%', #{param.maxRatedLoad}, '%') - - - AND a.files LIKE CONCAT('%', #{param.files}, '%') - - - AND a.status = #{param.status} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.user_id = #{param.userId} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - 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}, '%') - ) - - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerModelMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerModelMapper.xml deleted file mode 100644 index ee0ae23..0000000 --- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerModelMapper.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - SELECT a.* - FROM tower_model a - - - AND a.model_id = #{param.modelId} - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.model LIKE CONCAT('%', #{param.model}, '%') - - - AND a.parent_id = #{param.parentId} - - - AND a.image LIKE CONCAT('%', #{param.image}, '%') - - - AND a.user_id = #{param.userId} - - - AND a.year_life = #{param.yearLife} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND ( - a.name LIKE CONCAT('%', #{param.keywords}, '%') - OR a.model LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceMapper.xml deleted file mode 100644 index 6fed629..0000000 --- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceMapper.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - SELECT a.* - FROM tower_place a - - - AND a.place_id = #{param.placeId} - - - AND a.place_code LIKE CONCAT('%', #{param.placeCode}, '%') - - - AND a.equipment_type LIKE CONCAT('%', #{param.equipmentType}, '%') - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.standard LIKE CONCAT('%', #{param.standard}, '%') - - - AND a.type LIKE CONCAT('%', #{param.type}, '%') - - - AND a.push_system LIKE CONCAT('%', #{param.pushSystem}, '%') - - - AND a.other_param LIKE CONCAT('%', #{param.otherParam}, '%') - - - AND a.files LIKE CONCAT('%', #{param.files}, '%') - - - AND a.is_show = #{param.isShow} - - - AND a.user_id = #{param.userId} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.equipment_type LIKE CONCAT('%', #{param.keywords}, '%') - OR a.place_code = #{param.keywords} - OR a.name #{param.keywords} - ) - - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceSafetyMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceSafetyMapper.xml deleted file mode 100644 index 82e35d1..0000000 --- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceSafetyMapper.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - SELECT a.* - FROM tower_place_safety a - - - AND a.place_safety_id = #{param.placeSafetyId} - - - AND a.place_code LIKE CONCAT('%', #{param.placeCode}, '%') - - - AND a.equipment_type LIKE CONCAT('%', #{param.equipmentType}, '%') - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.check_standard LIKE CONCAT('%', #{param.checkStandard}, '%') - - - AND a.type LIKE CONCAT('%', #{param.type}, '%') - - - AND a.push_system LIKE CONCAT('%', #{param.pushSystem}, '%') - - - AND a.other_param LIKE CONCAT('%', #{param.otherParam}, '%') - - - AND a.files LIKE CONCAT('%', #{param.files}, '%') - - - AND a.is_show = #{param.isShow} - - - AND a.user_id = #{param.userId} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceStandardMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceStandardMapper.xml deleted file mode 100644 index 51988a5..0000000 --- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceStandardMapper.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - SELECT a.* - FROM tower_place_standard a - - - AND a.id = #{param.id} - - - AND a.place_id = #{param.placeId} - - - AND a.standard LIKE CONCAT('%', #{param.standard}, '%') - - - AND a.files LIKE CONCAT('%', #{param.files}, '%') - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectMapper.xml deleted file mode 100644 index 6819f21..0000000 --- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectMapper.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - SELECT a.* - FROM tower_project a - - - AND a.project_id = #{param.projectId} - - - AND a.project_name LIKE CONCAT('%', #{param.projectName}, '%') - - - AND a.company_name LIKE CONCAT('%', #{param.companyName}, '%') - - - AND a.customer_name LIKE CONCAT('%', #{param.customerName}, '%') - - - AND a.project_region LIKE CONCAT('%', #{param.projectRegion}, '%') - - - AND a.project_address LIKE CONCAT('%', #{param.projectAddress}, '%') - - - AND a.longitude LIKE CONCAT('%', #{param.longitude}, '%') - - - AND a.latitude LIKE CONCAT('%', #{param.latitude}, '%') - - - AND a.supervise_no LIKE CONCAT('%', #{param.superviseNo}, '%') - - - AND a.licence_no LIKE CONCAT('%', #{param.licenceNo}, '%') - - - AND a.security_status LIKE CONCAT('%', #{param.securityStatus}, '%') - - - AND a.competent_department LIKE CONCAT('%', #{param.competentDepartment}, '%') - - - AND a.dismantling_company LIKE CONCAT('%', #{param.dismantlingCompany}, '%') - - - AND a.truck_crane_specs LIKE CONCAT('%', #{param.truckCraneSpecs}, '%') - - - AND a.contract LIKE CONCAT('%', #{param.contract}, '%') - - - AND a.director = #{param.director} - - - AND a.project_director LIKE CONCAT('%', #{param.projectDirector}, '%') - - - AND a.project_status LIKE CONCAT('%', #{param.projectStatus}, '%') - - - AND a.salesman LIKE CONCAT('%', #{param.salesman}, '%') - - - AND a.status = #{param.status} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.user_id = #{param.userId} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectOrderMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectOrderMapper.xml deleted file mode 100644 index 7549e71..0000000 --- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectOrderMapper.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - SELECT a.* - FROM tower_project_order a - - - AND a.project_order_id = #{param.projectOrderId} - - - AND a.project_id = #{param.projectId} - - - AND a.equipment_name LIKE CONCAT('%', #{param.equipmentName}, '%') - - - AND a.equipment_model LIKE CONCAT('%', #{param.equipmentModel}, '%') - - - AND a.equipment_num = #{param.equipmentNum} - - - AND a.unit LIKE CONCAT('%', #{param.unit}, '%') - - - AND a.start_time LIKE CONCAT('%', #{param.startTime}, '%') - - - AND a.end_time LIKE CONCAT('%', #{param.endTime}, '%') - - - AND a.year LIKE CONCAT('%', #{param.year}, '%') - - - AND a.documenter LIKE CONCAT('%', #{param.documenter}, '%') - - - AND a.status = #{param.status} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.user_id = #{param.userId} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectPlaceMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectPlaceMapper.xml deleted file mode 100644 index dc461fe..0000000 --- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectPlaceMapper.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - 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 - - - AND a.id = #{param.id} - - - AND a.project_id = #{param.projectId} - - - AND a.place_id = #{param.placeId} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - 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}, '%') - ) - - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectUserMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectUserMapper.xml deleted file mode 100644 index d74c770..0000000 --- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectUserMapper.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - 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 - - - AND a.id = #{param.id} - - - AND a.role = #{param.role} - - - AND a.user_id = #{param.userId} - - - AND a.project_id = #{param.projectId} - - - AND a.status = #{param.status} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - 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}, '%') - ) - - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWarehouseMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWarehouseMapper.xml deleted file mode 100644 index 08b47b3..0000000 --- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWarehouseMapper.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - SELECT a.* - FROM tower_warehouse a - - - AND a.warehouse_id = #{param.warehouseId} - - - AND a.warehouse_name LIKE CONCAT('%', #{param.warehouseName}, '%') - - - AND a.warehouse_keeper LIKE CONCAT('%', #{param.warehouseKeeper}, '%') - - - AND a.warehouse_phone LIKE CONCAT('%', #{param.warehousePhone}, '%') - - - AND a.longitude LIKE CONCAT('%', #{param.longitude}, '%') - - - AND a.latitude LIKE CONCAT('%', #{param.latitude}, '%') - - - AND a.country LIKE CONCAT('%', #{param.country}, '%') - - - AND a.province LIKE CONCAT('%', #{param.province}, '%') - - - AND a.city LIKE CONCAT('%', #{param.city}, '%') - - - AND a.region LIKE CONCAT('%', #{param.region}, '%') - - - AND a.address LIKE CONCAT('%', #{param.address}, '%') - - - AND a.region_name LIKE CONCAT('%', #{param.regionName}, '%') - - - AND a.status = #{param.status} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.username = #{param.username} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - 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} - ) - - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerAccessoryParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerAccessoryParam.java deleted file mode 100644 index c8326ac..0000000 --- a/src/main/java/com/gxwebsoft/tower/param/TowerAccessoryParam.java +++ /dev/null @@ -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; - -} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerEquipmentParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerEquipmentParam.java deleted file mode 100644 index b3df3fe..0000000 --- a/src/main/java/com/gxwebsoft/tower/param/TowerEquipmentParam.java +++ /dev/null @@ -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; - -} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerModelParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerModelParam.java deleted file mode 100644 index 970767e..0000000 --- a/src/main/java/com/gxwebsoft/tower/param/TowerModelParam.java +++ /dev/null @@ -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; - -} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerPlaceParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerPlaceParam.java deleted file mode 100644 index 3800102..0000000 --- a/src/main/java/com/gxwebsoft/tower/param/TowerPlaceParam.java +++ /dev/null @@ -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 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; - -} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerPlaceSafetyParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerPlaceSafetyParam.java deleted file mode 100644 index 0385285..0000000 --- a/src/main/java/com/gxwebsoft/tower/param/TowerPlaceSafetyParam.java +++ /dev/null @@ -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; - -} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerPlaceStandardParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerPlaceStandardParam.java deleted file mode 100644 index 8e13943..0000000 --- a/src/main/java/com/gxwebsoft/tower/param/TowerPlaceStandardParam.java +++ /dev/null @@ -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; - -} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerProjectOrderParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerProjectOrderParam.java deleted file mode 100644 index 2864a5c..0000000 --- a/src/main/java/com/gxwebsoft/tower/param/TowerProjectOrderParam.java +++ /dev/null @@ -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 orders; - -} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerProjectParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerProjectParam.java deleted file mode 100644 index 46a8268..0000000 --- a/src/main/java/com/gxwebsoft/tower/param/TowerProjectParam.java +++ /dev/null @@ -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 users; - - @ApiModelProperty(value = "合同预定设备清单") - @TableField(exist = false) - private Set orders; - - @ApiModelProperty(value = "检查部位配置") - @TableField(exist = false) - private Set places1; - - @ApiModelProperty(value = "保养部位配置") - @TableField(exist = false) - private Set places2; - -} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerProjectPlaceParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerProjectPlaceParam.java deleted file mode 100644 index 86607ed..0000000 --- a/src/main/java/com/gxwebsoft/tower/param/TowerProjectPlaceParam.java +++ /dev/null @@ -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; - -} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerProjectUserParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerProjectUserParam.java deleted file mode 100644 index 0e0ad28..0000000 --- a/src/main/java/com/gxwebsoft/tower/param/TowerProjectUserParam.java +++ /dev/null @@ -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; - -} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerWarehouseParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerWarehouseParam.java deleted file mode 100644 index 2a1d29d..0000000 --- a/src/main/java/com/gxwebsoft/tower/param/TowerWarehouseParam.java +++ /dev/null @@ -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; - -} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerAccessoryService.java b/src/main/java/com/gxwebsoft/tower/service/TowerAccessoryService.java deleted file mode 100644 index 2224bf0..0000000 --- a/src/main/java/com/gxwebsoft/tower/service/TowerAccessoryService.java +++ /dev/null @@ -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 { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(TowerAccessoryParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(TowerAccessoryParam param); - - /** - * 根据id查询 - * - * @param accessoryId 自增ID - * @return TowerAccessory - */ - TowerAccessory getByIdRel(Integer accessoryId); - -} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerEquipmentService.java b/src/main/java/com/gxwebsoft/tower/service/TowerEquipmentService.java deleted file mode 100644 index de1a69b..0000000 --- a/src/main/java/com/gxwebsoft/tower/service/TowerEquipmentService.java +++ /dev/null @@ -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 { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(TowerEquipmentParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(TowerEquipmentParam param); - - /** - * 根据id查询 - * - * @param equipmentId 自增ID - * @return TowerEquipment - */ - TowerEquipment getByIdRel(Integer equipmentId); - -} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerModelService.java b/src/main/java/com/gxwebsoft/tower/service/TowerModelService.java deleted file mode 100644 index 8811eb7..0000000 --- a/src/main/java/com/gxwebsoft/tower/service/TowerModelService.java +++ /dev/null @@ -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 { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(TowerModelParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(TowerModelParam param); - - /** - * 根据id查询 - * - * @param categoryId 型号ID - * @return TowerModel - */ - TowerModel getByIdRel(Integer categoryId); - -} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerPlaceSafetyService.java b/src/main/java/com/gxwebsoft/tower/service/TowerPlaceSafetyService.java deleted file mode 100644 index 846b7a1..0000000 --- a/src/main/java/com/gxwebsoft/tower/service/TowerPlaceSafetyService.java +++ /dev/null @@ -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 { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(TowerPlaceSafetyParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(TowerPlaceSafetyParam param); - - /** - * 根据id查询 - * - * @param placeSafetyId 参数ID - * @return TowerPlaceSafety - */ - TowerPlaceSafety getByIdRel(Integer placeSafetyId); - -} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerPlaceService.java b/src/main/java/com/gxwebsoft/tower/service/TowerPlaceService.java deleted file mode 100644 index c047181..0000000 --- a/src/main/java/com/gxwebsoft/tower/service/TowerPlaceService.java +++ /dev/null @@ -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 { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(TowerPlaceParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(TowerPlaceParam param); - - /** - * 根据id查询 - * - * @param placeId 参数ID - * @return TowerPlace - */ - TowerPlace getByIdRel(Integer placeId); - -} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerPlaceStandardService.java b/src/main/java/com/gxwebsoft/tower/service/TowerPlaceStandardService.java deleted file mode 100644 index bce6671..0000000 --- a/src/main/java/com/gxwebsoft/tower/service/TowerPlaceStandardService.java +++ /dev/null @@ -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 { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(TowerPlaceStandardParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(TowerPlaceStandardParam param); - - /** - * 根据id查询 - * - * @param id 参数ID - * @return TowerPlaceStandard - */ - TowerPlaceStandard getByIdRel(Integer id); - -} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerProjectOrderService.java b/src/main/java/com/gxwebsoft/tower/service/TowerProjectOrderService.java deleted file mode 100644 index db761c7..0000000 --- a/src/main/java/com/gxwebsoft/tower/service/TowerProjectOrderService.java +++ /dev/null @@ -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 { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(TowerProjectOrderParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(TowerProjectOrderParam param); - - /** - * 根据id查询 - * - * @param projectOrderId 自增ID - * @return TowerProjectOrder - */ - TowerProjectOrder getByIdRel(Integer projectOrderId); - -} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerProjectPlaceService.java b/src/main/java/com/gxwebsoft/tower/service/TowerProjectPlaceService.java deleted file mode 100644 index 950ea42..0000000 --- a/src/main/java/com/gxwebsoft/tower/service/TowerProjectPlaceService.java +++ /dev/null @@ -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 { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(TowerProjectPlaceParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(TowerProjectPlaceParam param); - - /** - * 根据id查询 - * - * @param id 自增ID - * @return TowerProjectPlace - */ - TowerProjectPlace getByIdRel(Integer id); - -} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerProjectService.java b/src/main/java/com/gxwebsoft/tower/service/TowerProjectService.java deleted file mode 100644 index 84114fd..0000000 --- a/src/main/java/com/gxwebsoft/tower/service/TowerProjectService.java +++ /dev/null @@ -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 { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(TowerProjectParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(TowerProjectParam param); - - /** - * 根据id查询 - * - * @param projectId 自增ID - * @return TowerProject - */ - TowerProject getByIdRel(Integer projectId); - -} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerProjectUserService.java b/src/main/java/com/gxwebsoft/tower/service/TowerProjectUserService.java deleted file mode 100644 index 4a844d8..0000000 --- a/src/main/java/com/gxwebsoft/tower/service/TowerProjectUserService.java +++ /dev/null @@ -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 { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(TowerProjectUserParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(TowerProjectUserParam param); - - /** - * 根据id查询 - * - * @param id 自增ID - * @return TowerProjectUser - */ - TowerProjectUser getByIdRel(Integer id); - -} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerWarehouseService.java b/src/main/java/com/gxwebsoft/tower/service/TowerWarehouseService.java deleted file mode 100644 index c9095c4..0000000 --- a/src/main/java/com/gxwebsoft/tower/service/TowerWarehouseService.java +++ /dev/null @@ -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 { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(TowerWarehouseParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(TowerWarehouseParam param); - - /** - * 根据id查询 - * - * @param warehouseId 自增ID - * @return TowerWarehouse - */ - TowerWarehouse getByIdRel(Integer warehouseId); - -} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerAccessoryServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerAccessoryServiceImpl.java deleted file mode 100644 index a48aa07..0000000 --- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerAccessoryServiceImpl.java +++ /dev/null @@ -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 implements TowerAccessoryService { - - @Override - public PageResult pageRel(TowerAccessoryParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(TowerAccessoryParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam 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)); - } - -} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerEquipmentServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerEquipmentServiceImpl.java deleted file mode 100644 index 6555537..0000000 --- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerEquipmentServiceImpl.java +++ /dev/null @@ -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 implements TowerEquipmentService { - - @Override - public PageResult pageRel(TowerEquipmentParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(TowerEquipmentParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam 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)); - } - -} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerModelServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerModelServiceImpl.java deleted file mode 100644 index 3bd109f..0000000 --- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerModelServiceImpl.java +++ /dev/null @@ -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 implements TowerModelService { - - @Override - public PageResult pageRel(TowerModelParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(TowerModelParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam 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)); - } - -} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceSafetyServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceSafetyServiceImpl.java deleted file mode 100644 index 481fd4a..0000000 --- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceSafetyServiceImpl.java +++ /dev/null @@ -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 implements TowerPlaceSafetyService { - - @Override - public PageResult pageRel(TowerPlaceSafetyParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(TowerPlaceSafetyParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam 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)); - } - -} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceServiceImpl.java deleted file mode 100644 index 61ea96d..0000000 --- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceServiceImpl.java +++ /dev/null @@ -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 implements TowerPlaceService { - - @Override - public PageResult pageRel(TowerPlaceParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(TowerPlaceParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam 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)); - } - -} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceStandardServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceStandardServiceImpl.java deleted file mode 100644 index 9607273..0000000 --- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceStandardServiceImpl.java +++ /dev/null @@ -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 implements TowerPlaceStandardService { - - @Override - public PageResult pageRel(TowerPlaceStandardParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(TowerPlaceStandardParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam 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)); - } - -} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectOrderServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectOrderServiceImpl.java deleted file mode 100644 index bcc29f4..0000000 --- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectOrderServiceImpl.java +++ /dev/null @@ -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 implements TowerProjectOrderService { - - @Override - public PageResult pageRel(TowerProjectOrderParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(TowerProjectOrderParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam 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)); - } - -} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectPlaceServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectPlaceServiceImpl.java deleted file mode 100644 index 4555a61..0000000 --- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectPlaceServiceImpl.java +++ /dev/null @@ -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 implements TowerProjectPlaceService { - - @Override - public PageResult pageRel(TowerProjectPlaceParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(TowerProjectPlaceParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam 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)); - } - -} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectServiceImpl.java deleted file mode 100644 index e2d4680..0000000 --- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectServiceImpl.java +++ /dev/null @@ -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 implements TowerProjectService { - - @Override - public PageResult pageRel(TowerProjectParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(TowerProjectParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam 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)); - } - -} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectUserServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectUserServiceImpl.java deleted file mode 100644 index 548f7ef..0000000 --- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectUserServiceImpl.java +++ /dev/null @@ -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 implements TowerProjectUserService { - - @Override - public PageResult pageRel(TowerProjectUserParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(TowerProjectUserParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam 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)); - } - -} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerWarehouseServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerWarehouseServiceImpl.java deleted file mode 100644 index 984ffc9..0000000 --- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerWarehouseServiceImpl.java +++ /dev/null @@ -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 implements TowerWarehouseService { - - @Override - public PageResult pageRel(TowerWarehouseParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(TowerWarehouseParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam 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)); - } - -} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b83b2b5..e58ec58 100644 --- a/src/main/resources/application-dev.yml +++ b/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: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 575f40d..feca159 100644 --- a/src/main/resources/application-prod.yml +++ b/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: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ef9c873..552768d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -47,9 +47,9 @@ spring: max-request-size: 100MB redis: database: 7 - host: 127.0.0.1 - port: 6379 - password: + host: 47.107.122.174 + port: 16379 + password: redis_xGXDip # 邮件服务器配置 mail: diff --git a/src/test/java/com/gxwebsoft/generator/HouseGenerator.java b/src/test/java/com/gxwebsoft/generator/HouseGenerator.java deleted file mode 100644 index 1c24888..0000000 --- a/src/test/java/com/gxwebsoft/generator/HouseGenerator.java +++ /dev/null @@ -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 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 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(); - } - -} diff --git a/src/test/java/com/gxwebsoft/generator/LoveGenerator.java b/src/test/java/com/gxwebsoft/generator/LoveGenerator.java deleted file mode 100644 index a321d3f..0000000 --- a/src/test/java/com/gxwebsoft/generator/LoveGenerator.java +++ /dev/null @@ -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 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 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(); - } - -} diff --git a/src/test/java/com/gxwebsoft/generator/OaGenerator.java b/src/test/java/com/gxwebsoft/generator/OaGenerator.java deleted file mode 100644 index 5eb7c05..0000000 --- a/src/test/java/com/gxwebsoft/generator/OaGenerator.java +++ /dev/null @@ -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 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 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(); - } - -} diff --git a/src/test/java/com/gxwebsoft/generator/TowerGenerator.java b/src/test/java/com/gxwebsoft/generator/TowerGenerator.java deleted file mode 100644 index 94134f9..0000000 --- a/src/test/java/com/gxwebsoft/generator/TowerGenerator.java +++ /dev/null @@ -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 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 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(); - } - -}