no message

wms-vue/src/main.js

@@ -8,7 +8,7 @@ import VueRouter from "vue-router";
 import router from "@/router/router";
 import store from "@/store/store";
 Vue.prototype.$axios=axios;
-Vue.prototype.$httpUrl='http://192.168.56.138:8081';
+Vue.prototype.$httpUrl='http://192.168.56.147:8081';
 Vue.config.productionTip = false;
 Vue.use(VueRouter)
 Vue.use(ElementUI,{size:'small'});

wms/pom.xml

@@ -22,12 +22,6 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-            <version>8.0.32</version>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -35,11 +29,12 @@
         </dependency>
 
         <dependency>
-            <groupId>com.baomidou</groupId>
+            <groupId>org.springframework.boot</groupId>
-            <artifactId>mybatis-plus</artifactId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <version>3.4.2</version>
         </dependency>
 
+
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

wms/src/main/java/com/yc/wms/controller/MenuController.java

@@ -1,18 +1,11 @@
 package com.yc.wms.controller;
 
 
-import com.yc.wms.model.Menu;
-import com.yc.wms.service.MenuService;
-import com.yc.wms.until.Result;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  * <p>
  *  前端控制器
@@ -25,17 +18,11 @@ import java.util.List;
 @RequestMapping("/menu")
 public class MenuController {
 
-    @Autowired
-    private MenuService menuService;
     
     /**
      * 查询菜单
      * @param roleId
      * @return
      */
-    @GetMapping("/queryMenu")
+
-    public Result queryMenu(@RequestParam String roleId) {
-        List list=menuService.lambdaQuery().like(Menu::getMenuRight,roleId).list();
-        return Result.success(list);
-    }
 }

wms/src/main/java/com/yc/wms/controller/UserController.java

@@ -1,13 +1,6 @@
 package com.yc.wms.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yc.wms.model.Menu;
-import com.yc.wms.model.User;
 import com.yc.wms.service.DcxService;
-import com.yc.wms.service.MenuService;
-import com.yc.wms.service.UserService;
 import com.yc.wms.until.QueryPageUtil;
 import com.yc.wms.until.Result;
 import lombok.extern.slf4j.Slf4j;
@@ -15,13 +8,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.spring.web.json.Json;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -37,11 +27,7 @@ import java.util.List;
 @RequestMapping("/user")
 public class UserController {
 
-    @Autowired
-    private UserService userService;
 
-    @Autowired
-    private MenuService menuService;
 
     @Autowired
     private DcxService dcxService;
@@ -51,7 +37,7 @@ public class UserController {
      * 登录
      */
     @PostMapping ("/login")
-    public Result login(@RequestBody User user) {
+    public Result login(@RequestBody String user) {
 //        Result result = null;
 //       List<User> list= userService.lambdaQuery()
 //                  .eq(User::getUserNo,user.getUserNo())
@@ -133,71 +119,10 @@ public class UserController {
         return dcxService.readJson(query);
     }
 
-    /**
-     * @return
-     * @param新增或修改
-     */
-    @PostMapping("/addorupdate")
-    public Result addorupdate(@RequestBody User user) {
-        Result results = null;
-        boolean result = userService.saveOrUpdate(user);
-        if (result) {
-            results = Result.success();
-        } else {
-            results = Result.fail();
-        }
 
-        return results;
-    }
 
-    /**
-     * @return
-     * @param删除用户
-     */
-    @GetMapping("/deleteUser")
-    public Result deleteUser(String ids) {
-        Result result = null;
-        if (ids != null && ids.length() > 0) {
-            List<String> uersIds = Arrays.asList(ids.split(","));
-            for (String id : uersIds) {
-                userService.removeById(Integer.parseInt(id));
-            }
-            result = Result.success();
-        } else {
-            result = Result.fail("参数为null");
-        }
 
-        return result;
-    }
 
-    /**
-     * @return
-     * @param判断账号是否存在
-     */
-    @GetMapping("/queryuserNo")
-    public Result queryuserNo(@RequestParam String userNo, @RequestParam long id) {
-        Result result = null;
-        if (id > 0) {
-            List<User> list = userService.lambdaQuery().eq(User::getUserNo, userNo).list();
-            if (list.size() > 0) {
-                if (list.get(0).getId() == id && list.get(0).getUserNo().equals(userNo)) {
-                    result = Result.fail();
-                } else {
-                    result = Result.success(list);
-                }
-            } else {
-                result = Result.fail();
-            }
-        } else {
-            List list = userService.lambdaQuery().eq(User::getUserNo, userNo).list();
-            if (list.size() > 0) {
-                result = Result.success(list);
-            } else {
-                result = Result.fail();
-            }
-        }
-        return result;
-    }
 
 
 }

wms/src/main/java/com/yc/wms/mapper/MenuMapper.java

@@ -1,18 +0,0 @@
-package com.yc.wms.mapper;
-
-import com.yc.wms.model.Menu;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wms
- * @since 2023-07-07
- */
-@Mapper
-public interface MenuMapper extends BaseMapper<Menu> {
-
-}

wms/src/main/java/com/yc/wms/mapper/UserMapper.java

@@ -1,25 +0,0 @@
-package com.yc.wms.mapper;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yc.wms.model.User;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wms
- * @since 2023-03-04
- */
-@Mapper
-public interface UserMapper extends BaseMapper<User> {
-    List<User> Base_Column_List();
-
-    IPage QueryUser(IPage<User> page, @Param(Constants.WRAPPER) Wrapper wrapper);
-
-}

wms/src/main/java/com/yc/wms/model/Menu.java

@@ -1,62 +0,0 @@
-package com.yc.wms.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author wms
- * @since 2023-07-07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="Menu对象", description="")
-public class Menu implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "菜单编码")
-    @TableField("menuCode")
-    private String menuCode;
-
-    @ApiModelProperty(value = "菜单名称")
-    @TableField("menuName")
-    private String menuName;
-
-    @ApiModelProperty(value = "菜单级别")
-    @TableField("menuLevel")
-    private String menuLevel;
-
-    @ApiModelProperty(value = "菜单的父编号")
-    @TableField("menuParentCode")
-    private String menuParentCode;
-
-    @ApiModelProperty(value = "点击的触发的函数")
-    @TableField("menuClick")
-    private String menuClick;
-
-    @ApiModelProperty(value = "权限 0 超级管理员，1 管理员，2 用户 可以用逗号组合使用")
-    @TableField("menuRight")
-    private String menuRight;
-
-    @TableField("menuComponent")
-    private String menuComponent;
-
-    @ApiModelProperty(value = "图标")
-    @TableField("menuIcon")
-    private String menuIcon;
-
-
-}

wms/src/main/java/com/yc/wms/model/User.java

@@ -1,51 +0,0 @@
-package com.yc.wms.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author wms
- * @since 2023-03-04
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="User对象", description="")
-public class User implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    @TableId(type=IdType.AUTO)
-    private Integer id;
-
-    @TableField("userNo")
-    private String userNo;
-
-    @TableField("userName")
-    private String userName;
-
-    @TableField("passWord")
-    private String passWord;
-
-    private Integer age;
-
-    private Integer sex;
-
-    private String phone;
-
-    @TableField("roleId")
-    private Integer roleId;
-
-    @TableField("isValid")
-    private Boolean isValid=false;
-
-
-}

wms/src/main/java/com/yc/wms/service/DcxService.java

@@ -1,15 +1,9 @@
 package com.yc.wms.service;
 
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yc.wms.model.User;
 import com.yc.wms.until.QueryPageUtil;
 import com.yc.wms.until.Result;
 
-import java.util.List;
-
 /**
  * <p>
  *  服务类

wms/src/main/java/com/yc/wms/service/MenuService.java

@@ -1,16 +0,0 @@
-package com.yc.wms.service;
-
-import com.yc.wms.model.Menu;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author wms
- * @since 2023-07-07
- */
-public interface MenuService extends IService<Menu> {
-
-}

wms/src/main/java/com/yc/wms/service/UserService.java

@@ -1,26 +0,0 @@
-package com.yc.wms.service;
-
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yc.wms.model.User;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author wms
- * @since 2023-03-04
- */
-public interface UserService extends IService<User> {
-
-    public List<User> Base_Column_List();
-
-    public IPage QueryUser(IPage<User> page, Wrapper wrapper);
-
-}

wms/src/main/java/com/yc/wms/service/impl/DcxServiceImpl.java

@@ -8,11 +8,13 @@ import com.yc.wms.until.Result;
 import com.yc.wms.until.SpringContextHolder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.jdbc.object.SqlQuery;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
@@ -20,7 +22,9 @@ import javax.persistence.Query;
 @Slf4j
 public class DcxServiceImpl implements DcxService {
 
-    private  EntityManager entityManager;
+    @Autowired
+    private NamedParameterJdbcTemplate jdbcTemplate;
+
 
     @Override
     public Result readJson(QueryPageUtil query) {
@@ -33,7 +37,7 @@ public class DcxServiceImpl implements DcxService {
     }
 
     public Result queryKchz(QueryPageUtil query) {
-        EntityManager entity = SpringContextHolder.getBean(EntityManager.class);
+
         HashMap map = query.getParam();
 //        String itemCode = (String) map.get("itemCode");
         int pageNum = query.getPageNum();//当前页
@@ -49,8 +53,16 @@ public class DcxServiceImpl implements DcxService {
         sql = "select * " + sql + " WHERE RowNum BETWEEN " + (pageNum-1) * pageSize + " AND " + (pageNum) * pageSize;
         log.info("sqlCount:"+sqlCount);
         log.info("sql:"+sql);
-        log.info("entityManager:"+entity);
+
-        List<Object[]> list=entity.createNativeQuery(sql).getResultList();
+        //查询单挑数据
+        Map<String,Object> userMap2 = jdbcTemplate.queryForMap("select * from Container where ID=1", new HashMap<>());
+
+        //查询多条数据据
+        List<Map<String,Object>> userMap = jdbcTemplate.queryForList("select * from Container ", new HashMap<>());
+        System.out.println(userMap);
+
+
+        /*List<Object[]> list=entity.createNativeQuery(sql).getResultList();
         List listCount=entity.createNativeQuery(sqlCount).getResultList();
         JSONArray data = new JSONArray();
         for(Object[] obj:list){
@@ -66,8 +78,8 @@ public class DcxServiceImpl implements DcxService {
             d.put("roleId", 2);
             d.put("isValid", false);
             data.add(d);
-        }
+        }*/
-       return  Result.success(listCount.size(),data);
+       return  Result.success(userMap.size(),userMap);
     }
 
 }

wms/src/main/java/com/yc/wms/service/impl/MenuServiceImpl.java

@@ -1,20 +0,0 @@
-package com.yc.wms.service.impl;
-
-import com.yc.wms.model.Menu;
-import com.yc.wms.mapper.MenuMapper;
-import com.yc.wms.service.MenuService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author wms
- * @since 2023-07-07
- */
-@Service
-public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements MenuService {
-
-}

wms/src/main/java/com/yc/wms/service/impl/UserServiceImpl.java

@@ -1,38 +0,0 @@
-package com.yc.wms.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yc.wms.model.User;
-import com.yc.wms.mapper.UserMapper;
-import com.yc.wms.service.UserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import java.util.List;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author wms
- * @since 2023-03-04
- */
-@Service
-public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
-
-    @Autowired
-    private UserMapper UserMapper;
-
-    @Override
-    public List<User> Base_Column_List() {
-        return UserMapper.Base_Column_List();
-    }
-
-    @Override
-    public IPage QueryUser(IPage<User> page, Wrapper wrapper) {
-        return UserMapper.QueryUser(page,wrapper);
-    }
-
-}

wms/src/main/resources/mapper/MenuMapper.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yc.wms.mapper.MenuMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.yc.wms.model.Menu">
-        <id column="id" property="id" />
-        <result column="menuCode" property="menuCode" />
-        <result column="menuName" property="menuName" />
-        <result column="menuLevel" property="menuLevel" />
-        <result column="menuParentCode" property="menuParentCode" />
-        <result column="menuClick" property="menuClick" />
-        <result column="menuRight" property="menuRight" />
-        <result column="menuComponent" property="menuComponent" />
-        <result column="menuIcon" property="menuIcon" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, menuCode, menuName, menuLevel, menuParentCode, menuClick, menuRight, menuComponent, menuIcon
-    </sql>
-
-</mapper>

wms/src/main/resources/mapper/UserMapper.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yc.wms.mapper.UserMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.yc.wms.model.User">
-        <id column="id" property="id" />
-        <result column="userNo" property="userNo" />
-        <result column="userName" property="userName" />
-        <result column="passWord" property="passWord" />
-        <result column="age" property="age" />
-        <result column="sex" property="sex" />
-        <result column="phone" property="phone" />
-        <result column="roleId" property="roleId" />
-        <result column="isValid" property="isValid" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <select id="Base_Column_List" resultMap="BaseResultMap">
-        select * from user
-    </select>
-
-    <select id="QueryUser" resultType="com.yc.wms.model.User">
-        select * from user ${ew.customSqlSegment} order by id desc
-    </select>
-
-</mapper>