From adf89345e2de38b3169a78ebb2be466007d034c9 Mon Sep 17 00:00:00 2001 From: xioayue Date: Sat, 23 Jul 2022 22:46:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B1=BB=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/AdminGoodsClassifyController.java | 41 ++++++++++++++++++- .../cn/chjyj/szwh/mapper/ClassifyMapper.java | 7 ++++ .../chjyj/szwh/service/ClassifyService.java | 9 ++++ .../service/impl/ClassifyServiceImpl.java | 29 +++++++++++++ .../resources/mapper/szwh/ClassifyMapper.xml | 20 ++++----- .../resources/mapper/szwh/OrderMapper.xml | 2 +- 6 files changed, 94 insertions(+), 14 deletions(-) diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsClassifyController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsClassifyController.java index d2960da..c81d1cf 100644 --- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsClassifyController.java +++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsClassifyController.java @@ -1,11 +1,14 @@ package cn.chjyj.szwh.controller.admin; +import cn.chjyj.szwh.bean.Admin; import cn.chjyj.szwh.bean.Classify; import cn.chjyj.szwh.controller.BaseController; +import cn.chjyj.szwh.mapper.AdminMapper; import cn.chjyj.szwh.service.ClassifyService; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.auth0.jwt.JWT; +import com.auth0.jwt.interfaces.DecodedJWT; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -14,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -26,6 +30,10 @@ import java.util.Map; public class AdminGoodsClassifyController extends BaseController { @Autowired private ClassifyService classifyService; + //管理员信息 + @Autowired + private AdminMapper adminMapper; + @PostMapping("/list") public JSONObject clist(@RequestBody String jsonStr){ @@ -110,9 +118,40 @@ public class AdminGoodsClassifyController extends BaseController { public JSONObject getSon(HttpServletRequest request){ String topclass = request.getParameter("top_class"); List sonclass= classifyService.getSonClass(topclass); + List arr =new ArrayList(); + for(Classify cf:sonclass){ + arr.add(cf.getSonClass()); + } + jsonObject.put("code",200); + jsonObject.put("msg","成功"); + jsonObject.put("data",arr); + return jsonObject; + } + + /** + * 新增分类 + * @param jstr + * @return + */ + @PostMapping("/add") + public JSONObject addClass(@RequestBody String jstr,HttpServletRequest irequest){ + JSONObject request = JSON.parseObject(jstr); + String pullTopClass= request.getString("pull_top_class"); + String topClass = request.getString("top_class"); + String sonClass = request.getString("son_class"); + // 获取当前用户 + String token=irequest.getHeader("token"); + DecodedJWT decode = JWT.decode(token); + String accountId = decode.getClaim("accountId").asString(); + Admin admin = adminMapper.getAdminByAccountId(accountId); + String accountName = decode.getClaim("accountName").asString(); + + int userid=Integer.valueOf(admin.getId()); + + int ret = classifyService.addNewClass(pullTopClass,topClass,sonClass,userid,accountName); jsonObject.put("code",200); jsonObject.put("msg","成功"); - jsonObject.put("data",sonclass); + jsonObject.put("data",ret); return jsonObject; } } diff --git a/src/main/java/cn/chjyj/szwh/mapper/ClassifyMapper.java b/src/main/java/cn/chjyj/szwh/mapper/ClassifyMapper.java index b002f71..bcdd8a3 100644 --- a/src/main/java/cn/chjyj/szwh/mapper/ClassifyMapper.java +++ b/src/main/java/cn/chjyj/szwh/mapper/ClassifyMapper.java @@ -62,4 +62,11 @@ public interface ClassifyMapper { * @return */ List getSonClass(@Param("topclass") String topclass); + + /** + * 新增 + * @param classify + * @return + */ + int addClassify(Classify classify); } diff --git a/src/main/java/cn/chjyj/szwh/service/ClassifyService.java b/src/main/java/cn/chjyj/szwh/service/ClassifyService.java index 2b14c4c..3cd9e52 100644 --- a/src/main/java/cn/chjyj/szwh/service/ClassifyService.java +++ b/src/main/java/cn/chjyj/szwh/service/ClassifyService.java @@ -37,4 +37,13 @@ public interface ClassifyService { */ List getSonClass(String topClass); + /** + * 新增类目 + * @param pullTopclass + * @param topClass + * @param sonClass + * @return + */ + int addNewClass(String pullTopclass,String topClass,String sonClass,Integer userid,String uname); + } diff --git a/src/main/java/cn/chjyj/szwh/service/impl/ClassifyServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/ClassifyServiceImpl.java index 3b88699..0592e76 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/ClassifyServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/ClassifyServiceImpl.java @@ -7,6 +7,8 @@ import cn.chjyj.szwh.mapper.AdminMapper; import cn.chjyj.szwh.mapper.ClassifyMapper; import cn.chjyj.szwh.mapper.OperationLogMapper; import cn.chjyj.szwh.service.ClassifyService; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,6 +17,8 @@ import java.util.*; @Service public class ClassifyServiceImpl implements ClassifyService { + private static Log log = LogFactory.getLog(ClassifyServiceImpl.class); + @Autowired private ClassifyMapper classifyMapper; @Autowired @@ -106,4 +110,29 @@ public class ClassifyServiceImpl implements ClassifyService { return classifyMapper.getSonClass(topClass); } + @Override + public int addNewClass(String pullTopclass, String topClass, String sonClass,Integer userid,String uname) { + int ret=0; + Classify classify = new Classify(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + Date crt = sdf.parse(sdf.format(System.currentTimeMillis())); + classify.setCreatetime(crt); + classify.setTopClass(pullTopclass); + classify.setSonClass(sonClass); + classify.setUserId(userid); + ret = classifyMapper.addClassify(classify); + //保存操作记录 + OperationLog oplog = new OperationLog(); + oplog.setLogid(ret); + oplog.setType("class"); + String msg ="由"+uname+"创建"; + oplog.setMessage(msg); + operationLogMapper.addLog(oplog); + }catch (Exception ex){ + log.error(ex); + } + return ret; + } + } diff --git a/src/main/resources/mapper/szwh/ClassifyMapper.xml b/src/main/resources/mapper/szwh/ClassifyMapper.xml index 34b3094..7da14f4 100644 --- a/src/main/resources/mapper/szwh/ClassifyMapper.xml +++ b/src/main/resources/mapper/szwh/ClassifyMapper.xml @@ -65,21 +65,17 @@ - + insert into - (uname,password,gender,urealname,ubirth,nickname,avatarurl,platfrom,sessionkey,openid) + (top_class,son_class,user_id,status,createtime,is_deleted) values ( - #{uname}, - #{password}, - #{gender}, - #{urealname}, - #{ubirth}, - #{nickname}, - #{avatarurl}, - #{platfrom}, - #{sessionkey}, - #{openid} + #{topClass}, + #{sonClass}, + #{userId}, + 0, + #{createtime}, + 0 ) diff --git a/src/main/resources/mapper/szwh/OrderMapper.xml b/src/main/resources/mapper/szwh/OrderMapper.xml index 53e8849..14f0172 100644 --- a/src/main/resources/mapper/szwh/OrderMapper.xml +++ b/src/main/resources/mapper/szwh/OrderMapper.xml @@ -91,7 +91,7 @@ - select count(*) from