同步用户+菜品图片

eladmin-system/src/main/java/me/zhengjie/config/rabbitmq/test/ListenerTemplate.java

@@ -13,6 +13,7 @@ import me.zhengjie.modules.dm.daypc.domain.DmDayPc;
 import me.zhengjie.modules.dm.daypc.service.DmDayPcService;
 import me.zhengjie.modules.dm.food.domain.DmFood;
 import me.zhengjie.modules.dm.food.service.DmFoodService;
+import me.zhengjie.modules.dm.foodCate.domain.DmFoodCate;
 import me.zhengjie.modules.dm.order.domain.DmOrderItem;
 import me.zhengjie.modules.dm.order.domain.DmOrderPayment;
 import me.zhengjie.modules.dm.order.domain.DmOrderRecord;
@@ -41,7 +42,7 @@ public class ListenerTemplate {
 //    @Autowired
 //    DmOrderPaymentService dmOrderPaymentService;
 
-    @RabbitListener(queues = CuisineProduce.NAME, containerFactory = CuisineProduce.LISTENER)
+//    @RabbitListener(queues = CuisineProduce.NAME, containerFactory = CuisineProduce.LISTENER)
     public void dealDeclareMessage(Message message) throws UnsupportedEncodingException {
         String str = new String(message.getBody(),"utf-8");
         System.out.println("receivePc:"+str);
@@ -63,7 +64,9 @@ public class ListenerTemplate {
                 dmDayPc.setWindow(attendance.getInteger("window"));
                 dmDayPc.setState(attendance.getString("state"));
                 dmDayPc.setName(attendance.getString("name"));
-                dmDayPc.setCate(attendance.getInteger("cate"));
+                DmFoodCate dmFoodCate = new DmFoodCate();
+                dmFoodCate.setId(attendance.getInteger("cate"));
+                dmDayPc.setCate(dmFoodCate);
                 dmDayPc.setPid(attendance.getLong("pid"));
                 dmDayPc.setGoods(attendance.getString("goods"));
                 dmDayPc.setBarcode(attendance.getString("barcode"));
@@ -82,7 +85,8 @@ public class ListenerTemplate {
                 dmFood.setId(dmDayPc.getPid());
                 dmFood.setName(dmDayPc.getName());
                 dmFood.setPrice(dmDayPc.getPrice());
-                dmFood.setType(dmDayPc.getCate().toString());
+                dmFood.setType(dmDayPc.getCate());//.toString()
+//                dmFood.setCateName(dmDayPc.getCateName());
                 dmFood.setPstate(dmDayPc.getPstate());
                 dmFoodService.create(dmFood);
             }

eladmin-system/src/main/java/me/zhengjie/modules/dm/daypc/domain/DmDayPc.java

@@ -21,6 +21,7 @@ import io.swagger.annotations.ApiModelProperty;
 import cn.hutool.core.bean.copier.CopyOptions;
 import me.zhengjie.base.BaseEntity;
 import me.zhengjie.modules.dm.food.domain.DmFood;
+import me.zhengjie.modules.dm.foodCate.domain.DmFoodCate;
 import me.zhengjie.modules.dm.rfidTableware.domain.DmRfidTableware;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -95,9 +96,10 @@ public class DmDayPc implements Serializable {
     @ApiModelProperty(value = "餐别")
     private String qtyBook;
 
-    @Column(name = "cate")
+    @OneToOne
+    @JoinColumn(name = "cate",referencedColumnName = "cate_id")
     @ApiModelProperty(value = "菜品分类id")
-    private Integer cate;
+    private DmFoodCate cate;
 
     @Column(name = "cate_name")
     @ApiModelProperty(value = "菜品分类名称")

eladmin-system/src/main/java/me/zhengjie/modules/dm/daypc/repository/DmDayPcRepository.java

@@ -31,12 +31,19 @@ import java.util.Map;
 **/
 public interface DmDayPcRepository extends JpaRepository<DmDayPc, Long>, JpaSpecificationExecutor<DmDayPc> {
 
-    @Query(value = "SELECT DISTINCT a.`pcid`, `pid`, a.`id`, a.`name`, a.`price`, `times`, `cate`, `cate_name`, a.`state`, " +
-            " `window`, `window_name`, a.`pstate`, a.`barcode`, a.`no`, a.`goods`, a.`pinyin`, a.`qty_book`, `seq`, `date`, `shopname`,0 as `food.id`,null as `food.code`," +
-            "null as `food.name`,null as `food.type`,null as `food.price`,null as `food.picture`,null as `food.remark`," +
-            "null as `food.create_by`,null as `food.update_by`,null as `food.create_time`,null as `food.update_time`," +
-            "0 as `food.num` FROM dm_day_pc a LEFT JOIN dm_food b ON a.pid=b.id " +
-            "WHERE date_format(date,'%Y-%m-%d') = date_format(now(),'%Y-%m-%d') ",nativeQuery = true)
+//    @Query(value = "SELECT DISTINCT a.`pcid`, `pid`, a.`id`, a.`name`, a.`price`, `times`, `cate`, `cate_name`, a.`state`, " +
+//            " `window`, `window_name`, a.`pstate`, a.`barcode`, a.`no`, a.`goods`, a.`pinyin`, a.`qty_book`, `seq`, `date`, `shopname`,0 as `food.id`,null as `food.code`," +
+//            "null as `food.name`,null as `food.type`,null as `food.price`,null as `food.picture`,null as `food.remark`," +
+//            "null as `food.create_by`,null as `food.update_by`,null as `food.create_time`,null as `food.update_time`," +
+//            "0 as `food.num` FROM dm_day_pc a LEFT JOIN dm_food b ON a.pid=b.id " +
+//            "WHERE date_format(date,'%Y-%m-%d') = date_format(now(),'%Y-%m-%d') ",nativeQuery = true)
+//    List<DmDayPc> foodRepository();
+
+    @Query(value = "SELECT DISTINCT a.`pcid`, a.`pid`, a.`id`, a.`name`, a.`price`, `times`,a.`cate`, a.`cate_name`, a.`state`, " +
+            "`window`,`window_name`, a.`pstate`, a.`barcode`, a.`no`, a.`goods`, a.`pinyin`, a.`qty_book`, `seq`, `date`, " +
+            "`shopname`,0 as cate_id,0 as pid,NULL as cate_name,null as picture,null as create_by,null as update_by," +
+            "null as create_time,null as update_time FROM dm_day_pc a LEFT JOIN dm_food_cate c ON a.cate = c.cate_id " +
+            "WHERE date_format(date,'%Y-%m-%d') = date_format(now(),'%Y-%m-%d')",nativeQuery = true)
     List<DmDayPc> foodRepository();
 
     /**

eladmin-system/src/main/java/me/zhengjie/modules/dm/daypc/service/dto/DmDayPcDto.java

@@ -23,6 +23,7 @@ import java.io.Serializable;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.serializer.ToStringSerializer;
 import me.zhengjie.modules.dm.food.domain.DmFood;
+import me.zhengjie.modules.dm.foodCate.domain.DmFoodCate;
 import me.zhengjie.modules.dm.rfidTableware.domain.DmRfidTableware;
 
 import javax.persistence.Column;
@@ -70,7 +71,8 @@ public class DmDayPcDto implements Serializable {
     private String qtyBook;
 
     /** 菜品分类id */
-    private Integer cate;
+//    private Integer cate;
+    private DmFoodCate cate;
 
     /** 菜品分类名称 */
     private String cateName;

eladmin-system/src/main/java/me/zhengjie/modules/dm/food/domain/DmFood.java

@@ -20,6 +20,7 @@ import cn.hutool.core.bean.BeanUtil;
 import io.swagger.annotations.ApiModelProperty;
 import cn.hutool.core.bean.copier.CopyOptions;
 import me.zhengjie.base.BaseEntity;
+import me.zhengjie.modules.dm.foodCate.domain.DmFoodCate;
 import me.zhengjie.utils.SecurityUtils;
 import org.springframework.security.core.userdetails.UserDetails;
 
@@ -66,9 +67,14 @@ public class DmFood extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "描述")
     private String remark;
 
-    @Column(name = "type")
+    @OneToOne
+    @JoinColumn(name = "type",referencedColumnName = "cate_id")
     @ApiModelProperty(value = "类型")
-    private String type;
+    private DmFoodCate type;
+
+//    @Column(name = "cate_name")
+//    @ApiModelProperty(value = "菜品分类名称")
+//    private String cateName;
 
     @Column(name = "pstate")
     @ApiModelProperty(value = "菜品状态")

eladmin-system/src/main/java/me/zhengjie/modules/dm/food/service/dto/DmFoodDto.java

@@ -22,6 +22,7 @@ import java.io.Serializable;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.serializer.ToStringSerializer;
 import me.zhengjie.base.BaseDTO;
+import me.zhengjie.modules.dm.foodCate.domain.DmFoodCate;
 
 /**
 * @website https://el-admin.vip
@@ -43,7 +44,9 @@ public class DmFoodDto extends BaseDTO implements Serializable {
     private String name;
 
     /** 类型 */
-    private String type;
+    private DmFoodCate type;
+
+    private String cateName;
 
     /** 单价 */
     private BigDecimal price;

eladmin-system/src/main/java/me/zhengjie/modules/dm/food/service/dto/DmFoodQueryCriteria.java

@@ -18,6 +18,7 @@ package me.zhengjie.modules.dm.food.service.dto;
 import lombok.Data;
 import java.util.List;
 import me.zhengjie.annotation.Query;
+import me.zhengjie.modules.dm.foodCate.domain.DmFoodCate;
 
 /**
 * @website https://el-admin.vip
@@ -37,5 +38,8 @@ public class DmFoodQueryCriteria{
 
     /** 精确 */
     @Query
-    private String type;
+    private DmFoodCate type;
+
+    @Query
+    private String cateName;
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/foodPj/domain/DmFoodPj.java

@@ -19,6 +19,7 @@ import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import io.swagger.annotations.ApiModelProperty;
 import cn.hutool.core.bean.copier.CopyOptions;
+import me.zhengjie.modules.dm.foodCate.domain.DmFoodCate;
 import me.zhengjie.modules.dm.user.domain.DmUser;
 
 import javax.persistence.*;
@@ -54,9 +55,14 @@ public class DmFoodPj implements Serializable {
     @ApiModelProperty(value = "菜品编号")
     private String foodCode;
 
-    @Column(name = "food_type")
+    @OneToOne
+    @JoinColumn(name = "food_type",referencedColumnName = "cate_id")
     @ApiModelProperty(value = "菜品分类")
-    private String foodType;
+    private DmFoodCate foodType;
+
+//    @Column(name = "cate_name")
+//    @ApiModelProperty(value = "菜品分类名称")
+//    private String cateName;
 
     @OneToOne
     @JoinColumn(name = "user_code",referencedColumnName = "id")

eladmin-system/src/main/java/me/zhengjie/modules/dm/foodPj/service/dto/DmFoodPjDto.java

@@ -20,6 +20,7 @@ import java.sql.Timestamp;
 import java.io.Serializable;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.serializer.ToStringSerializer;
+import me.zhengjie.modules.dm.foodCate.domain.DmFoodCate;
 import me.zhengjie.modules.dm.user.domain.DmUser;
 
 /**
@@ -37,6 +38,8 @@ public class DmFoodPjDto implements Serializable {
 
     private Long oid;
 
+    private String cateName;
+
     /** 菜品名称 */
     private String foodName;
 
@@ -44,7 +47,7 @@ public class DmFoodPjDto implements Serializable {
     private String foodCode;
 
     /** 菜品分类 */
-    private String foodType;
+    private DmFoodCate foodType;
 
     /** 用户工号 */
     private DmUser userCode;

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/dto/DmOrderRecordQueryCriteria.java

@@ -43,4 +43,7 @@ public class DmOrderRecordQueryCriteria{
     /** BETWEEN */
     @Query(type = Query.Type.BETWEEN)
     private List<Timestamp> createDate;
+
+    @Query
+    private String money;
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/impl/DmOrderItemServiceImpl.java

@@ -65,7 +65,8 @@ public class DmOrderItemServiceImpl implements DmOrderItemService {
         Integer sum = 0;
         for(DmOrderItem dmOrderItem: list) {
             list1.add(dmOrderItem);
-            sum += Integer.valueOf(dmOrderItem.getMoney());
+            Double reseve = dmOrderItem.getAmt();
+            sum += reseve.intValue();
         }
         DmOrderItem dmOrderItem = new DmOrderItem();
         dmOrderItem.setName("合计");

eladmin-system/src/main/java/me/zhengjie/modules/dm/service/repository/DmServicePjRepository.java

@@ -40,4 +40,7 @@ public interface DmServicePjRepository extends JpaRepository<DmServicePj, Intege
     @Modifying
     @Query(value = " update dm_service_pj set enabled = ?1 ",nativeQuery = true)
     void updatePj(String enabled);
+
+    @Query(value = "SELECT COUNT(1) FROM dm_service_pj WHERE to_days(pj_time) = to_days(now()) AND user_code = :userCode",nativeQuery = true)
+    int servicePjApp(@Param("userCode") String userCode);
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/service/service/DmServicePjService.java

@@ -19,6 +19,8 @@ import me.zhengjie.modules.dm.service.domain.DmServicePj;
 import me.zhengjie.modules.dm.service.service.dto.DmServicePjDto;
 import me.zhengjie.modules.dm.service.service.dto.DmServicePjQueryCriteria;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.repository.query.Param;
+
 import java.util.Map;
 import java.util.List;
 import java.io.IOException;
@@ -93,4 +95,6 @@ public interface DmServicePjService {
     * @throws IOException /
     */
     void download(List<DmServicePjDto> all, HttpServletResponse response) throws IOException;
+
+    int servicePjApp(String userCode);
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/service/service/impl/DmServicePjServiceImpl.java

@@ -127,4 +127,9 @@ public class DmServicePjServiceImpl implements DmServicePjService {
         }
         FileUtil.downloadExcel(list, response);
     }
+
+    @Override
+    public int servicePjApp(String userCode) {
+        return dmServicePjRepository.servicePjApp(userCode);
+    }
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/user/domain/DmUser.java

@@ -93,6 +93,11 @@ public class DmUser extends BaseEntity implements Serializable {
     @Column(name = "face_id")
     @ApiModelProperty(value = "人脸照片")
     private String faceid;
+
+    @Column(name = "card_id",nullable = false)
+    @ApiModelProperty(value = "卡号")
+    private String cardId;
+
     /*@Column(name = "create_by")
     @ApiModelProperty(value = "创建者")
     private String createBy;

eladmin-system/src/main/java/me/zhengjie/modules/dm/user/service/dto/DmUserDto.java

@@ -62,4 +62,6 @@ public class DmUserDto extends BaseDTO implements Serializable {
 
     private String faceid;
 
+    private String cardId;
+
 }

eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/VideoDataTask.java

@@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.dm.video.domain.DmVideo;
 import me.zhengjie.modules.dm.video.service.DmVideoService;
-import me.zhengjie.utils.BeanMapUtils;
+//import me.zhengjie.utils.BeanMapUtils;
 import me.zhengjie.utils.FileUtil;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
@@ -32,23 +32,23 @@ public class VideoDataTask {
     }
 
     private void videoSync(){
-        String url = "http://xxx:xxx/xxx";
-
-//        JSONObject dataJSON = JSONObject.parseObject(BeanMapUtils.doPostForm(url,null));
-        String postData = BeanMapUtils.doPostForm(url,null);
-        MultipartFile dataJSON = JSONObject.parseObject(postData,MultipartFile.class);
-        JSONObject jsonObject = JSONObject.parseObject(postData);
-        JSONArray content = jsonObject.getJSONArray("data");
-        // 判断文件是否为图片
-        String suffix = FileUtil.getExtensionName(dataJSON.getOriginalFilename());
-        if(!FileUtil.VIDEO.equals(FileUtil.getFileType(suffix))){
-            throw new BadRequestException("只能上传图片");
-        }
-
-        for (int i = 0; i < content.size(); i++) {
-            MultipartFile file = JSONObject.parseObject(content.getString(i), MultipartFile.class);
-            dmVideoService.create(null,file);
-        }
+//        String url = "http://xxx:xxx/xxx";
+//
+////        JSONObject dataJSON = JSONObject.parseObject(BeanMapUtils.doPostForm(url,null));
+//        String postData = BeanMapUtils.doPostForm(url,null);
+//        MultipartFile dataJSON = JSONObject.parseObject(postData,MultipartFile.class);
+//        JSONObject jsonObject = JSONObject.parseObject(postData);
+//        JSONArray content = jsonObject.getJSONArray("data");
+//        // 判断文件是否为图片
+//        String suffix = FileUtil.getExtensionName(dataJSON.getOriginalFilename());
+//        if(!FileUtil.VIDEO.equals(FileUtil.getFileType(suffix))){
+//            throw new BadRequestException("只能上传图片");
+//        }
+//
+//        for (int i = 0; i < content.size(); i++) {
+//            MultipartFile file = JSONObject.parseObject(content.getString(i), MultipartFile.class);
+//            dmVideoService.create(null,file);
+//        }
 
         //按页获取
 //        for (int k = 0; k < pageTotal; k++) {

eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/ZkDataSyncTask.java

@@ -226,6 +226,7 @@ public class ZkDataSyncTask {
                 dmUser.setSex(user.getGender());
 
                 JSONObject dmUserObject = userData.getJSONObject("dmUser");
+                dmUser.setCardId(dmUserObject.getString("cardid"));
                 dmUser.setFaceid(dmUserObject.getString("faceid"));
                 DmUser newDmUser = dmUserRepository.save(dmUser);
                 user.setDmUser(newDmUser);
@@ -283,6 +284,7 @@ public class ZkDataSyncTask {
                 dmUser.setSex(user.getGender());
 
                 JSONObject dmUserObject = userData.getJSONObject("dmUser");
+                dmUser.setCardId(dmUserObject.getString("cardid"));
                 dmUser.setFaceid(dmUserObject.getString("faceid"));
                 DmUser newDmUser = dmUserRepository.save(dmUser);
                 user.setDmUser(newDmUser);

eladmin-system/src/main/java/me/zhengjie/modules/thirdparty/v1/OpenApiController.java

@@ -1,13 +1,16 @@
 package me.zhengjie.modules.thirdparty.v1;
 
+import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.AnonymousAccess;
 import me.zhengjie.annotation.Log;
+import me.zhengjie.annotation.rest.AnonymousGetMapping;
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
 import me.zhengjie.base.BaseResponse;
 import me.zhengjie.base.QueryPageParams;
+import me.zhengjie.config.rabbitmq.test.SendTemplate;
 import me.zhengjie.domain.LocalStorage;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.dm.daypc.domain.DmDayPc;
@@ -26,6 +29,7 @@ import me.zhengjie.modules.dmApp.service.AppFoodPjService;
 import me.zhengjie.service.LocalStorageService;
 import me.zhengjie.utils.FileUtil;
 import me.zhengjie.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -33,6 +37,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -62,7 +67,13 @@ public class OpenApiController {
     @ApiOperation("新增服务评价")
     public BaseResponse<Object> createApp(@RequestBody QueryPageParams<DmServicePj> resources){
         SecurityUtils.CheckApiAuth(resources);
-        return new BaseResponse<>(dmServicePjService.createApp(resources.getQuery()));
+        int count = dmServicePjService.servicePjApp(resources.getQuery().getUserCode());
+        if (count >= 1){
+            throw new BadRequestException("该用户已评价，今日不可评价！");
+        }else {
+            dmServicePjService.createApp(resources.getQuery());
+        }
+        return new BaseResponse<>(count);
     }
 
     @AnonymousPostMapping(value = "/appFoodPj")
@@ -131,4 +142,5 @@ public class OpenApiController {
         return new BaseResponse<>(orderItemRepository.hyFood());
     }
 
+
 }