diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/DevInfo.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/DevInfo.java index 00b342b..42a7de0 100644 --- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/DevInfo.java +++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/DevInfo.java @@ -59,7 +59,7 @@ public class DevInfo extends BaseEntity private Integer cityId; @Excel(name = "设备所在区id") - @ApiModelProperty(value = "设备所在省id") + @ApiModelProperty(value = "设备所在区id") private Integer areaId; /** 设备品牌 */ diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmCompanyInfoController.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmCompanyInfoController.java index cb08c8b..f461113 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmCompanyInfoController.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmCompanyInfoController.java @@ -4,6 +4,7 @@ import com.bonus.zlpt.bigscreen.domain.vo.*; import com.bonus.zlpt.common.core.web.controller.BaseController; import com.bonus.zlpt.common.core.web.domain.AjaxResult; import com.bonus.zlpt.bigscreen.service.BmCompanyInfoService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -30,6 +31,7 @@ public class BmCompanyInfoController extends BaseController { * @param * @return */ + @ApiOperation(value = "根据企业类型查询对应数量以及总数量") @GetMapping("/type-list") public AjaxResult typeList() { List list = bmCompanyInfoService.selectTypeList(); @@ -56,6 +58,7 @@ public class BmCompanyInfoController extends BaseController { * * @return */ + @ApiOperation(value = "根据企业类型所属查询设备类型数量及经纬度") @GetMapping("/coltd-list") public AjaxResult coltdList() { @@ -80,6 +83,7 @@ public class BmCompanyInfoController extends BaseController { return success(voList); } + private ColtdVo getColtdVoByStatus(List coltdVos, String maStatus) { for (ColtdVo coltdVo : coltdVos) { @@ -107,6 +111,7 @@ public class BmCompanyInfoController extends BaseController { * @param * @return */ + @ApiOperation(value = "根据时间查询设备历史经纬度") @GetMapping("/time-list/{beginTime}/{endTime}/{maId}") public AjaxResult timeList(@PathVariable("beginTime") String beginTime, @PathVariable("endTime") String endTime,@PathVariable("maId") String maId) diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmMachinistInfoController.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmMachinistInfoController.java index cca18b4..587bcb2 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmMachinistInfoController.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmMachinistInfoController.java @@ -4,6 +4,7 @@ import com.bonus.zlpt.common.core.web.controller.BaseController; import com.bonus.zlpt.common.core.web.domain.AjaxResult; import com.bonus.zlpt.bigscreen.domain.vo.CompanyInfoVo; import com.bonus.zlpt.bigscreen.service.BmMachinistInfoService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -30,6 +31,7 @@ public class BmMachinistInfoController extends BaseController { * 获取企业所属对应的机手数量以及机手总人数 * @return */ + @ApiOperation(value = "获取企业所属对应的机手数量以及机手总人数") @GetMapping("/list") public AjaxResult list() { diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaDevInfoController.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaDevInfoController.java index a60d9b6..540b230 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaDevInfoController.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaDevInfoController.java @@ -8,6 +8,7 @@ import com.bonus.zlpt.bigscreen.domain.vo.CoTypeVo; import com.bonus.zlpt.bigscreen.domain.vo.CompanyInfoVo; import com.bonus.zlpt.bigscreen.domain.vo.TypeVo; import com.bonus.zlpt.bigscreen.service.MaDevInfoService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -34,6 +35,7 @@ public class MaDevInfoController extends BaseController { * 查询平台入驻设备总数 * @return */ + @ApiOperation(value = "查询平台入驻设备总数") @GetMapping("/list") public AjaxResult List() { @@ -45,6 +47,7 @@ public class MaDevInfoController extends BaseController { * @param * @return */ + @ApiOperation(value = "根据类型查询设备总数") @GetMapping("/type-list") public AjaxResult typeList() { @@ -65,6 +68,7 @@ public class MaDevInfoController extends BaseController { * @param * @return */ + @ApiOperation(value = "根据设备类型查询数量") @GetMapping("/matype-list") public AjaxResult maTypeList() { @@ -84,6 +88,7 @@ public class MaDevInfoController extends BaseController { * 获取企业所属设备状态为自有的设备数量 * @return */ + @ApiOperation(value = "获取企业所属设备状态为自有的设备数量") @GetMapping("/company-list") public AjaxResult companyList() { @@ -95,6 +100,7 @@ public class MaDevInfoController extends BaseController { * 查询设备状态为在租的设备名称及数量 * @return */ + @ApiOperation(value = "查询设备状态为在租的设备名称及数量") @GetMapping("/ma-list") public AjaxResult maList() { @@ -106,6 +112,7 @@ public class MaDevInfoController extends BaseController { * 查询公司对应的热门设备数量 * @return */ + @ApiOperation(value = "查询公司对应的热门设备数量") @GetMapping("/hot-list") public AjaxResult hotList() { @@ -118,6 +125,7 @@ public class MaDevInfoController extends BaseController { * @param maId 设备id * @return */ + @ApiOperation(value = "根据设备id查询设备详情相关信息") @GetMapping("/list/{maId}") public AjaxResult listById(@PathVariable("maId") String maId) { diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaLeaseInfoController.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaLeaseInfoController.java index c450e30..da96a89 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaLeaseInfoController.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaLeaseInfoController.java @@ -5,6 +5,7 @@ import com.bonus.zlpt.common.core.web.domain.AjaxResult; import com.bonus.zlpt.bigscreen.domain.MaLeaseInfo; import com.bonus.zlpt.bigscreen.domain.vo.MaLeaseInfoVo; import com.bonus.zlpt.bigscreen.service.MaLeaseInfoService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -31,6 +32,7 @@ public class MaLeaseInfoController extends BaseController { * @param maLeaseInfo * @return */ + @ApiOperation(value = "根据求出租信息查询对应的数量") @GetMapping("/type-list") public AjaxResult typeList(MaLeaseInfo maLeaseInfo) { diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaOrderInfoController.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaOrderInfoController.java index ea0c9c1..6e45ddf 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaOrderInfoController.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaOrderInfoController.java @@ -6,6 +6,7 @@ import com.bonus.zlpt.bigscreen.domain.MaOrderInfo; import com.bonus.zlpt.bigscreen.domain.vo.MaOrderInfoVo; import com.bonus.zlpt.bigscreen.domain.vo.MaOrderVo; import com.bonus.zlpt.bigscreen.service.MaOrderInfoService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -30,6 +31,7 @@ public class MaOrderInfoController extends BaseController { * 获取每个月对应的订单数量 * @return */ + @ApiOperation(value = "获取每个月对应的订单数量") @GetMapping("/list") public AjaxResult list(MaOrderInfo maOrderInfo) { @@ -42,6 +44,7 @@ public class MaOrderInfoController extends BaseController { * @param maOrderInfo * @return */ + @ApiOperation(value = "查询今日订单额以及订单数量") @GetMapping("/today-list") public AjaxResult todayList(MaOrderInfo maOrderInfo) { diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/MaUserCollectController.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/MaUserCollectController.java index c4cc444..7ff4370 100644 --- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/MaUserCollectController.java +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/MaUserCollectController.java @@ -36,7 +36,7 @@ public class MaUserCollectController extends BaseController { /** * 新增 -- 收藏设备 */ - @RequiresPermissions("system:collect:add") + // @RequiresPermissions("system:collect:add") @Log(title = "收藏设备", businessType = BusinessType.INSERT) @PostMapping("saveCollectedEquipment") @ApiOperation("新增 -- 收藏设备") @@ -51,7 +51,7 @@ public class MaUserCollectController extends BaseController { /** * 获取收藏列表 */ - @RequiresPermissions("system:collect:list") + // @RequiresPermissions("system:collect:list") @GetMapping("/getColletList") @ApiOperation("获取收藏列表") public AjaxResult getColletList(MaUserCollect obj) { @@ -66,7 +66,7 @@ public class MaUserCollectController extends BaseController { /** * 删除 -- 取消收藏 */ - @RequiresPermissions("system:collect:remove") + //@RequiresPermissions("system:collect:remove") @Log(title = "取消收藏", businessType = BusinessType.DELETE) @PostMapping("cancelCollet") @ApiOperation("删除 -- 取消收藏") @@ -82,7 +82,7 @@ public class MaUserCollectController extends BaseController { /** * 查询 -- 根据设备id获取信息 */ - @RequiresPermissions("system:collect:list") + // @RequiresPermissions("system:collect:list") @Log(title = "根据设备id查询信息", businessType = BusinessType.OTHER) @GetMapping("selectByMaId") @ApiOperation("查询 -- 根据设备id获取信息") diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/FileInfoController.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/FileInfoController.java index a631503..34ae49c 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/FileInfoController.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/FileInfoController.java @@ -31,6 +31,8 @@ Controller @Deprecated @RestController @RequestMapping("/file") + + public class FileInfoController extends BaseController { @Autowired diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/HotSearchController.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/HotSearchController.java index 2117d94..e996aa8 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/HotSearchController.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/HotSearchController.java @@ -11,6 +11,7 @@ import com.bonus.zlpt.common.log.enums.BusinessType; import com.bonus.zlpt.common.security.annotation.RequiresPermissions; import com.bonus.zlpt.equip.api.domain.HotSearch; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -39,7 +40,8 @@ public class HotSearchController extends BaseController /** * 查询热搜设备列表 */ - @RequiresPermissions("equip:search:list") + @ApiOperation(value = "查询热搜设备列表") + //@RequiresPermissions("equip:search:list") @GetMapping("/list") public TableDataInfo list(HotSearch hotSearch) { @@ -51,7 +53,8 @@ public class HotSearchController extends BaseController /** * 导出热搜设备列表 */ - @RequiresPermissions("equip:search:export") + @ApiOperation(value = "导出热搜设备列表") + //@RequiresPermissions("equip:search:export") @Log(title = "热搜设备", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, HotSearch hotSearch) @@ -64,7 +67,8 @@ public class HotSearchController extends BaseController /** * 获取热搜设备详细信息 */ - @RequiresPermissions("equip:search:query") + @ApiOperation(value = "获取热搜设备详细信息") + //@RequiresPermissions("equip:search:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -74,7 +78,8 @@ public class HotSearchController extends BaseController /** * 新增热搜设备 */ - @RequiresPermissions("equip:search:add") + @ApiOperation(value = "新增热搜设备") + //@RequiresPermissions("equip:search:add") @Log(title = "热搜设备", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody HotSearch hotSearch) @@ -85,7 +90,8 @@ public class HotSearchController extends BaseController /** * 修改热搜设备 */ - @RequiresPermissions("equip:search:edit") + @ApiOperation(value = "修改热搜设备") + //@RequiresPermissions("equip:search:edit") @Log(title = "热搜设备", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody HotSearch hotSearch) @@ -96,7 +102,8 @@ public class HotSearchController extends BaseController /** * 删除热搜设备 */ - @RequiresPermissions("equip:search:remove") + @ApiOperation(value = "删除热搜设备") + //@RequiresPermissions("equip:search:remove") @Log(title = "热搜设备", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/LeaseInfoController.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/LeaseInfoController.java index 7168270..8db975a 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/LeaseInfoController.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/LeaseInfoController.java @@ -11,6 +11,7 @@ import com.bonus.zlpt.common.log.enums.BusinessType; import com.bonus.zlpt.common.security.annotation.RequiresPermissions; import com.bonus.zlpt.equip.api.domain.LeaseInfo; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -39,7 +40,8 @@ public class LeaseInfoController extends BaseController /** * 查询租赁信息列表 */ - @RequiresPermissions("equip:info:list") + @ApiOperation(value = "查询租赁信息列表") + //@RequiresPermissions("equip:info:list") @GetMapping("/list") public TableDataInfo list(LeaseInfo leaseInfo) { @@ -51,7 +53,8 @@ public class LeaseInfoController extends BaseController /** * 导出租赁信息列表 */ - @RequiresPermissions("equip:info:export") + @ApiOperation(value = "导出租赁信息列表") + //@RequiresPermissions("equip:info:export") @Log(title = "租赁信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, LeaseInfo leaseInfo) @@ -64,7 +67,8 @@ public class LeaseInfoController extends BaseController /** * 获取租赁信息详细信息 */ - @RequiresPermissions("equip:info:query") + @ApiOperation(value = "获取租赁信息详细信息") + //@RequiresPermissions("equip:info:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -74,7 +78,8 @@ public class LeaseInfoController extends BaseController /** * 新增租赁信息 */ - @RequiresPermissions("equip:info:add") + @ApiOperation(value = "新增租赁信息") + //@RequiresPermissions("equip:info:add") @Log(title = "租赁信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody LeaseInfo leaseInfo) @@ -85,7 +90,8 @@ public class LeaseInfoController extends BaseController /** * 修改租赁信息 */ - @RequiresPermissions("equip:info:edit") + @ApiOperation(value = "修改租赁信息") + //@RequiresPermissions("equip:info:edit") @Log(title = "租赁信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody LeaseInfo leaseInfo) @@ -96,7 +102,8 @@ public class LeaseInfoController extends BaseController /** * 删除租赁信息 */ - @RequiresPermissions("equip:info:remove") + @ApiOperation(value = "删除租赁信息") + //@RequiresPermissions("equip:info:remove") @Log(title = "租赁信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/TypeInfoController.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/TypeInfoController.java index fc8c4d8..03b2c28 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/TypeInfoController.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/TypeInfoController.java @@ -11,6 +11,7 @@ import com.bonus.zlpt.common.log.enums.BusinessType; import com.bonus.zlpt.common.security.annotation.RequiresPermissions; import com.bonus.zlpt.equip.api.domain.TypeInfo; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -40,6 +41,7 @@ public class TypeInfoController extends BaseController * 查询设备类型列表 */ //@RequiresPermissions("equip:info:list") + @ApiOperation(value = "查询设备类型列表") @PostMapping("/list") public TableDataInfo list(@RequestBody TypeInfo typeInfo) { startPage(); @@ -50,7 +52,8 @@ public class TypeInfoController extends BaseController /** * 导出设备类型列表 */ - @RequiresPermissions("equip:info:export") + @ApiOperation(value = "导出设备类型列表") + //@RequiresPermissions("equip:info:export") @Log(title = "设备类型", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, TypeInfo typeInfo) @@ -63,7 +66,8 @@ public class TypeInfoController extends BaseController /** * 获取设备类型详细信息 */ - @RequiresPermissions("equip:info:query") + @ApiOperation(value = "获取设备类型详细信息") + //@RequiresPermissions("equip:info:query") @GetMapping(value = "/{typeId}") public AjaxResult getInfo(@PathVariable("typeId") Long typeId) { @@ -73,7 +77,8 @@ public class TypeInfoController extends BaseController /** * 新增设备类型 */ - @RequiresPermissions("equip:info:add") + @ApiOperation(value = "新增设备类型") + //@RequiresPermissions("equip:info:add") @Log(title = "设备类型", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody TypeInfo typeInfo) @@ -84,7 +89,8 @@ public class TypeInfoController extends BaseController /** * 修改设备类型 */ - @RequiresPermissions("equip:info:edit") + @ApiOperation(value = "修改设备类型") + //@RequiresPermissions("equip:info:edit") @Log(title = "设备类型", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody TypeInfo typeInfo) @@ -95,7 +101,8 @@ public class TypeInfoController extends BaseController /** * 删除设备类型 */ - @RequiresPermissions("equip:info:remove") + @ApiOperation(value = "删除设备类型") + //@RequiresPermissions("equip:info:remove") @Log(title = "设备类型", businessType = BusinessType.DELETE) @DeleteMapping("/{typeIds}") public AjaxResult remove(@PathVariable Long[] typeIds) @@ -106,6 +113,7 @@ public class TypeInfoController extends BaseController /** * 删除设备类型 */ + @ApiOperation(value = "删除设备类型") @DeleteMapping("/remove/{typeId}") public AjaxResult remove(@PathVariable Long typeId) { @@ -116,6 +124,7 @@ public class TypeInfoController extends BaseController * 获取设备类型树结构 * @return */ + @ApiOperation(value = "获取设备类型树结构") @GetMapping("/treeSelect") public AjaxResult treeSelect(){ diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java index fe699c8..bcb35be 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java @@ -3,6 +3,7 @@ package com.bonus.zlpt.equip.controller; import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import com.bonus.zlpt.common.core.utils.poi.ExcelUtil; import com.bonus.zlpt.common.core.web.controller.BaseController; @@ -22,6 +23,7 @@ import com.bonus.zlpt.equip.mapper.DevInfoMapper; import com.bonus.zlpt.equip.service.IDevInfoService; import com.bonus.zlpt.system.api.RemoteUserService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -39,13 +41,13 @@ Controller @RequestMapping("/off") public class UpOffController extends BaseController { - @Autowired + @Resource private IUpOffService upOffService; - @Autowired + @Resource private IDevInfoService devInfoService; - @Autowired + @Resource private RemoteUserService remoteUserService; @@ -55,7 +57,8 @@ public class UpOffController extends BaseController * 查询设备上下架管理 列表 */ - @RequiresPermissions("equip:off:list") + @ApiOperation(value = "查询设备上下架管理") + //@RequiresPermissions("equip:off:list") @GetMapping("/list") public TableDataInfo list(UpOff upOff) { @@ -68,6 +71,7 @@ public class UpOffController extends BaseController * 设备上下架审批管理 * @return */ + @ApiOperation(value = "设备上下架审批管理") @PostMapping("/selectList") public TableDataInfo selectList(@RequestBody UpOffDto upOffDto){ @@ -82,6 +86,7 @@ public class UpOffController extends BaseController * 审批获取详细数据 * @return */ + @ApiOperation(value = "审批获取详细数据") @GetMapping("/selectInfo") public AjaxResult selectInfo(@RequestParam("ids") List ids){ @@ -89,10 +94,10 @@ public class UpOffController extends BaseController } /** - * 导出设备上下架管理 -列表 + * 导出设备上下架管理列表 */ - @RequiresPermissions("equip:off:export") + @ApiOperation(value = "导出设备上下架管理列表") + // @RequiresPermissions("equip:off:export") @Log(title = "设备上下架管理", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, UpOff upOff) @@ -103,10 +108,10 @@ public class UpOffController extends BaseController } /** - * 获取设备上下架管理 -详细信息 + * 获取设备上下架管理详细信息 */ - @RequiresPermissions("equip:off:query") + @ApiOperation(value = "获取设备上下架管理详细信息") + //@RequiresPermissions("equip:off:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -117,6 +122,7 @@ public class UpOffController extends BaseController * 新增设备上下架管理 */ // @RequiresPermissions("equip:off:add") + @ApiOperation(value = "新增设备上下架管理") @Log(title = "设备上下架管理", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody List upOffList) @@ -131,6 +137,7 @@ public class UpOffController extends BaseController * 审批接口 */ //@RequiresPermissions("equip:off:edit") + @ApiOperation(value = "审批接口") @Log(title = "设备上下架管理", businessType = BusinessType.UPDATE) @PostMapping("/edit") @Transactional @@ -158,8 +165,8 @@ public class UpOffController extends BaseController /** * 删除设备上下架管理 - */ + @ApiOperation(value = "删除设备上下架管理") // @RequiresPermissions("equip:off:remove") @Log(title = "设备上下架管理", businessType = BusinessType.DELETE) @GetMapping("/remove") @@ -173,6 +180,7 @@ public class UpOffController extends BaseController * @param upOffList * @return */ + @ApiOperation(value = "商品批量上下架") @Log(title = "设备上下架管理", businessType = BusinessType.INSERT) @PostMapping("/upOffList") public AjaxResult upOffList(@RequestBody List upOffList) diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UserCollectController.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UserCollectController.java index 0e6016e..2ec0aa9 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UserCollectController.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UserCollectController.java @@ -16,6 +16,7 @@ import com.bonus.zlpt.common.security.utils.SecurityUtils; import com.bonus.zlpt.equip.api.domain.UserCollect; import com.bonus.zlpt.system.api.model.LoginUser; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -46,7 +47,8 @@ public class UserCollectController extends BaseController * 查询我的收藏 列表 */ - @RequiresPermissions("equip:collect:list") + @ApiOperation(value = "查询我的收藏") + //@RequiresPermissions("equip:collect:list") @GetMapping("/list") public TableDataInfo list(UserCollect userCollect) { @@ -59,7 +61,8 @@ public class UserCollectController extends BaseController * 导出我的收藏 列表 */ - @RequiresPermissions("equip:collect:export") + //@RequiresPermissions("equip:collect:export") + @ApiOperation(value = "导出我的收藏") @Log(title = "我的收藏", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, UserCollect userCollect) @@ -70,10 +73,10 @@ public class UserCollectController extends BaseController } /** - * 获取我的收藏 -详细信息 + * 获取我的收藏详细信息 */ - @RequiresPermissions("equip:collect:query") + @ApiOperation(value = "获取我的收藏详细信息") + //@RequiresPermissions("equip:collect:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -82,9 +85,9 @@ public class UserCollectController extends BaseController /** * 新增我的收藏 - */ - @RequiresPermissions("equip:collect:add") + @ApiOperation(value = "新增我的收藏") + //@RequiresPermissions("equip:collect:add") @Log(title = "我的收藏", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody UserCollect userCollect) @@ -96,7 +99,8 @@ public class UserCollectController extends BaseController * 修改我的收藏 */ - @RequiresPermissions("equip:collect:edit") + @ApiOperation(value = "修改我的收藏") + //@RequiresPermissions("equip:collect:edit") @Log(title = "我的收藏", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody UserCollect userCollect) @@ -118,7 +122,8 @@ public class UserCollectController extends BaseController * 删除我的收藏 */ - @RequiresPermissions("equip:collect:remove") + @ApiOperation(value = "删除我的收藏") + //@RequiresPermissions("equip:collect:remove") @Log(title = "我的收藏", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java index 292a0c4..7f08a2e 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java @@ -27,6 +27,7 @@ import com.bonus.zlpt.equip.mapper.SysFileInfoMapper; import org.springframework.stereotype.Service; import com.bonus.zlpt.equip.mapper.DevInfoMapper; import com.bonus.zlpt.equip.service.IDevInfoService; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -220,6 +221,7 @@ public class DevInfoServiceImpl implements IDevInfoService * @return 结果 */ @Override + @Transactional public int insertDevInfo(DevInfo devInfo) { devInfo.setCreateTime(DateUtils.getDate()); diff --git a/zlpt-visual/zlpt-monitor/src/main/resources/bootstrap.yml b/zlpt-visual/zlpt-monitor/src/main/resources/bootstrap.yml index a9d3dc9..245c863 100644 --- a/zlpt-visual/zlpt-monitor/src/main/resources/bootstrap.yml +++ b/zlpt-visual/zlpt-monitor/src/main/resources/bootstrap.yml @@ -16,11 +16,11 @@ spring: password: Bonus@admin123! discovery: # 服务注册地址 - server-addr: 192.168.1.3:8848 + server-addr: 192.168.0.14:8848 namespace: zlpt_cloud_dev config: # 配置中心地址 - server-addr: 192.168.1.3:8848 + server-addr: 192.168.0.14:8848 namespace: zlpt_cloud_dev # 配置文件格式 file-extension: yml