提交相关代码

zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java

@@ -21,6 +21,7 @@ import com.bonus.zlpt.system.api.RemoteUserService;
 import com.bonus.zlpt.system.api.domain.SysUser;
 import com.bonus.zlpt.system.api.model.LoginUser;
 
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.regex.Matcher;
@@ -34,7 +35,7 @@ import java.util.regex.Pattern;
 @Component
 public class SysLoginService
 {
-    @Autowired
+    @Resource
     private RemoteUserService remoteUserService;
 
     @Autowired
@@ -161,6 +162,7 @@ public class SysLoginService
         sysUser.setUserName(username);
         sysUser.setNickName(username);
         sysUser.setPassword(SecurityUtils.encryptPassword(password));
+        sysUser.setLoginDate(new Date());
         R<?> registerResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER);
 
         if (R.FAIL == registerResult.getCode())

zlpt-gateway/src/main/java/com/bonus/zlpt/gateway/ZlptGatewayApplication.java

@@ -15,6 +15,6 @@ public class ZlptGatewayApplication
     public static void main(String[] args)
     {
         SpringApplication.run(ZlptGatewayApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  若依网关启动成功   ლ(´ڡ`ლ)ﾞ  \n");
+        System.out.println("(♥◠‿◠)ﾉﾞ  租赁平台网关启动成功   ლ(´ڡ`ლ)ﾞ  \n");
     }
 }

zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java

@@ -47,7 +47,7 @@ public class DevInfoController extends BaseController
         return getDataTable(list);
     }
 
-    @RequiresPermissions("equip:info:list")
+   // @RequiresPermissions("equip:info:list")
     @ApiOperation(value = "装备推荐列表")
     @GetMapping("/hotList")
     public TableDataInfo hotList(DevInfoVo devInfo)
@@ -60,7 +60,7 @@ public class DevInfoController extends BaseController
     /**
      * 导出设备信息列表
      */
-    @RequiresPermissions("equip:info:export")
+   // @RequiresPermissions("equip:info:export")
     @ApiOperation(value = "导出装备信息")
     @Log(title = "设备信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -74,9 +74,9 @@ public class DevInfoController extends BaseController
     /**
      * 获取设备信息详细信息
      */
-    @RequiresPermissions("equip:info:query")
+    //@RequiresPermissions("equip:info:query")
     @ApiOperation(value = "装备详情")
-    @GetMapping(value = "/{maId}")
+    @GetMapping(value = "/getInfo/{maId}")
     public AjaxResult getInfo(@PathVariable("maId") Long maId)
     {
         return success(devInfoService.selectDevInfoByMaId(maId));
@@ -97,7 +97,7 @@ public class DevInfoController extends BaseController
     /**
      * 修改设备信息
      */
-    @RequiresPermissions("equip:info:edit")
+   // @RequiresPermissions("equip:info:edit")
     @ApiOperation(value = "更新装备")
     @Log(title = "设备信息", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -109,7 +109,7 @@ public class DevInfoController extends BaseController
     /**
      * 删除设备信息
      */
-    @RequiresPermissions("equip:info:remove")
+    //@RequiresPermissions("equip:info:remove")
     @ApiOperation(value = "删除装备")
     @Log(title = "设备信息", businessType = BusinessType.DELETE)
 	@PostMapping("/remove")

zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java

@@ -8,6 +8,7 @@ import com.bonus.zlpt.equip.api.domain.dto.InforMationDto;
 import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo;
 import com.bonus.zlpt.common.core.domain.system.SysFile;
 import com.bonus.zlpt.common.core.utils.DateUtils;
+import com.bonus.zlpt.equip.api.enums.MaStatusEnum;
 import com.bonus.zlpt.system.api.domain.BaseAddress;
 import com.bonus.zlpt.system.api.domain.SysDic;
 import org.springframework.beans.BeanUtils;
@@ -237,7 +238,7 @@ public class DevInfoServiceImpl implements IDevInfoService
         //根据key计算每种状态的数量
         for (String key : keys) {
             List<DevInfo> DevInfoList =  groupedByMaStatus.get(key);
-            sumTypeMap.put(key,DevInfoList.size());
+            sumTypeMap.put(MaStatusEnum.getNameByCode(Integer.parseInt(key)),DevInfoList.size());
         }
         return sumTypeMap;
     }

zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java

@@ -3,6 +3,7 @@ package com.bonus.zlpt.order.controller;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo;
 import com.bonus.zlpt.common.core.utils.poi.ExcelUtil;
@@ -43,14 +44,14 @@ public class OrderInfoController extends BaseController
 
     @Autowired
     private IOrderInfoService orderInfoService;
-    @Autowired
+    @Resource
     RemoteDevInfoService remoteDevInfoService;
 
     /**
      * 查询订单信息列表
      */
     @ApiOperation(value = "订单列表")
-    @RequiresPermissions("order:info:list")
+   // @RequiresPermissions("order:info:list")
     @GetMapping("/list")
     public TableDataInfo list(OrderInfoVo orderInfo)
     {
@@ -80,7 +81,7 @@ public class OrderInfoController extends BaseController
      * 导出订单信息列表
      */
     @ApiOperation(value = "导出订单")
-    @RequiresPermissions("order:info:export")
+   // @RequiresPermissions("order:info:export")
     @Log(title = "订单信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, OrderInfoVo orderInfo)
@@ -94,7 +95,7 @@ public class OrderInfoController extends BaseController
      * 获取订单信息详细信息
      */
     @ApiOperation(value = "订单详情")
-    @RequiresPermissions("order:info:query")
+   // @RequiresPermissions("order:info:query")
     @GetMapping(value = "/{orderId}")
     public AjaxResult getInfo(@PathVariable("orderId") Long orderId)
     {
@@ -133,7 +134,7 @@ public class OrderInfoController extends BaseController
      * 新增订单信息
      */
     @ApiOperation(value = "新增订单")
-    @RequiresPermissions("order:info:add")
+   // @RequiresPermissions("order:info:add")
     @Log(title = "订单信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody OrderInfoVo orderInfo)
@@ -145,7 +146,7 @@ public class OrderInfoController extends BaseController
      * 修改订单信息
      */
     @ApiOperation(value = "更新订单")
-    @RequiresPermissions("order:info:edit")
+    //@RequiresPermissions("order:info:edit")
     @Log(title = "订单信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody OrderInfoVo orderInfo)
@@ -157,7 +158,7 @@ public class OrderInfoController extends BaseController
      * 驳回订单
      */
     @ApiOperation(value = "驳回订单")
-    @RequiresPermissions("order:info:edit")
+   // @RequiresPermissions("order:info:edit")
     @Log(title = "订单信息", businessType = BusinessType.REJECT)
     @PutMapping(value = "/reject")
     public AjaxResult reject(@RequestBody OrderInfoVo orderInfo)
@@ -170,7 +171,7 @@ public class OrderInfoController extends BaseController
      * 删除订单信息
      */
     @ApiOperation(value = "删除订单")
-    @RequiresPermissions("order:info:remove")
+    //@RequiresPermissions("order:info:remove")
     @Log(title = "订单信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{orderIds}")
     public AjaxResult remove(@PathVariable Long[] orderIds)
@@ -182,7 +183,7 @@ public class OrderInfoController extends BaseController
      * 获取订单统计信息
      */
     @ApiOperation(value = "订单统计")
-    @RequiresPermissions("order:info:query")
+    //@RequiresPermissions("order:info:query")
     @GetMapping(value = "/count")
     public AjaxResult count()
     {

zlpt-modules/zlpt-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -161,7 +161,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			<if test="remark != null and remark != ''">remark,</if>
 			<if test="parentId != null and parentId != ''">parent_id,</if>
- 			create_time
+ 			create_time,
+			login_date
  		)values(
  			<if test="userId != null and userId != ''">#{userId},</if>
  			<if test="deptId != null and deptId != ''">#{deptId},</if>
@@ -176,7 +177,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
 			<if test="parentId != null and parentId != ''">#{parentId},</if>
- 			sysdate()
+ 			sysdate(),
+			sysdate()
  		)
 	</insert>