安卓接口改造

imcs-bt-be/imcs-authority-server/src/main/java/com/github/zuihou/api/AndroidApi.java

@@ -15,11 +15,16 @@ import com.github.zuihou.business.order.entity.Order;
 import com.github.zuihou.business.order.service.OrderService;
 import com.github.zuihou.business.productConfig.entity.ProductConfig;
 import com.github.zuihou.business.productConfig.service.ProductConfigService;
+import com.github.zuihou.business.productionresource.entity.ProductionResource;
+import com.github.zuihou.business.productionresource.service.ProductionTenantResourceService;
 import com.github.zuihou.business.spe.entity.Spe;
 import com.github.zuihou.business.spe.service.SpeService;
+import com.github.zuihou.business.util.CommonUtil;
 import com.github.zuihou.business.wxpay.CipherDto;
 import com.github.zuihou.cfg.WxPayCfg;
 import com.github.zuihou.context.BaseContextHandler;
+import com.github.zuihou.database.mybatis.conditions.Wraps;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.utils.WxPayUtil;
 import com.wechat.pay.contrib.apache.httpclient.auth.Verifier;
 import com.wechat.pay.contrib.apache.httpclient.util.AesUtil;
@@ -47,7 +52,7 @@ import java.util.concurrent.TimeUnit;
  */
 @RestController
 @RequestMapping("externalApi")
-public class ExternalApi {
+public class AndroidApi {
     @Autowired
     private GoodsService goodsService;
     @Autowired
@@ -76,6 +81,8 @@ public class ExternalApi {
     private EquBarrelService barrelService;
     @Autowired
     private MiniAppService miniAppService;
+    @Autowired
+    private ProductionTenantResourceService productionTenantResourceService;
 
 
     @ApiOperation("获取商品列表")
@@ -322,22 +329,49 @@ public class ExternalApi {
         UpdateWrapper<Order> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", orderId).set("order_status", orderStatus);
         boolean update = orderService.update(updateWrapper);
-        if(orderStatus=="5"){
+        if (orderStatus == "5") {
 //            生产完成，扣减物料，更新料筒和商品状态
 
-            barrelService.updateBarrel(speId,equId);
-
-
-
-
+            barrelService.updateBarrel(speId, equId);
         }
+        return R.success(update);
+    }
 
 
+    /**
+     * 获取未绑定的设备列表
+     *
+     * @return
+     */
+    @GetMapping("/getUnboundEquList")
+    public R<List<ProductionResource>> getUnboundEquList() {
+        LbqWrapper<ProductionResource> queryWrap = Wraps.lbQ();
+        queryWrap.eq(ProductionResource::getIdBound, "0").orderByDesc(ProductionResource::getCreateTime);
+        List<Long> orgIds = CommonUtil.getOrgIdsArr();
+        if (orgIds.size() > 0) {
+            queryWrap.in(ProductionResource::getOrgId, orgIds);
+        }
+        List<ProductionResource> list = productionTenantResourceService.list(queryWrap);
+        return R.success(list);
+    }
 
 
-        return R.success(update);
+    /**
+     * 绑定,解绑，设备
+     *
+     * @return
+     */
+    @GetMapping("/boundEqu")
+    public R<Boolean> boundEqu(String equId, String isBound) {
+        UpdateWrapper<ProductionResource> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("is_bound", isBound);
+        updateWrapper.eq("id", equId);
+        boolean update = productionTenantResourceService.update(updateWrapper);
+        if (update) {
+            return R.success(update, "操作成功");
+        }
+        return R.fail("操作失败");
     }
 
 
-
 }

imcs-bt-be/imcs-business-biz/src/main/java/com/github/zuihou/business/company/service/impl/CompanyServiceImpl.java

@@ -3,34 +3,26 @@ package com.github.zuihou.business.company.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.zuihou.authority.dao.common.AreaMapper;
 import com.github.zuihou.authority.entity.common.Area;
-import com.github.zuihou.authority.service.common.AreaService;
 import com.github.zuihou.base.R;
 import com.github.zuihou.base.request.PageParams;
+import com.github.zuihou.base.service.SuperServiceImpl;
 import com.github.zuihou.business.company.dao.CompanyMapper;
 import com.github.zuihou.business.company.dto.CompanyPageDTO;
 import com.github.zuihou.business.company.entity.Company;
 import com.github.zuihou.business.company.service.CompanyService;
-import com.github.zuihou.base.service.SuperServiceImpl;
-
-import com.github.zuihou.business.goodsCate.entity.GoodsCate;
 import com.github.zuihou.common.util.StringUtil;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
-import com.github.zuihou.model.RemoteData;
 import com.xxl.job.core.util.JacksonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.utils.Lists;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -93,7 +85,7 @@ public class CompanyServiceImpl extends SuperServiceImpl<CompanyMapper, Company>
             }
             item.setProvinceList(provinceList);
         });
-        log.info("公司首页自定义多表分页数据"+JacksonUtil.writeValueAsString(page));
+//        log.info("公司首页自定义多表分页数据"+JacksonUtil.writeValueAsString(page));
         return page;
     }
 

imcs-bt-be/imcs-business-entity/src/main/java/com/github/zuihou/business/productionresource/entity/ProductionResource.java

@@ -64,7 +64,6 @@ public class ProductionResource extends Entity<Long> {
     private String advUrl;
 
 
-
     /**
      * 区域ID
      */
@@ -291,36 +290,41 @@ public class ProductionResource extends Entity<Long> {
     private Long opsUserId;
 
     @ApiModelProperty(value = "区域地址")
-    @TableField(exist=false)
+    @TableField(exist = false)
     private String areaIds;
 
     @ApiModelProperty(value = "场地名称")
-    @TableField(exist=false)
+    @TableField(exist = false)
     private String placeName;
 
     @ApiModelProperty(value = "部门名称")
-    @TableField(exist=false)
+    @TableField(exist = false)
     private String lineDesc;
 
     @ApiModelProperty(value = "企业名称")
-    @TableField(exist=false)
+    @TableField(exist = false)
     private String tenantDesc;
 
     @ApiModelProperty(value = "模型图片")
-    @TableField(exist=false)
+    @TableField(exist = false)
     private String pic;
 
     @ApiModelProperty(value = "场景地址")
-    @TableField(exist=false)
+    @TableField(exist = false)
     private String address;
 
+    @ApiModelProperty(value = "是否绑定")
+    @TableField(value = "is_bound", condition = EQUAL)
+    private String idBound;
+
+
     @Builder
     public ProductionResource(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser,
-                    Long compnayId, String moduleId, String areaId, String name, String resourcesCategory, 
-                    String code, String status, String onlineStatus, String remark, String ip, String port, 
-                    Integer gatherTaskId, Float incomeToday, Integer exceptionOrderNum, Integer cacheStorgeNum, Integer maxSpeed, String capitalNo, 
-                    String capitalName, String capitalType, String modeSpecification, String capitalPrice, String productionDate, String productionNo, 
-                    String manufacturer, Integer programNum, Long orgId) {
+                              Long compnayId, String moduleId, String areaId, String name, String resourcesCategory,
+                              String code, String status, String onlineStatus, String remark, String ip, String port,
+                              Integer gatherTaskId, Float incomeToday, Integer exceptionOrderNum, Integer cacheStorgeNum, Integer maxSpeed, String capitalNo,
+                              String capitalName, String capitalType, String modeSpecification, String capitalPrice, String productionDate, String productionNo,
+                              String manufacturer, Integer programNum, Long orgId) {
         this.id = id;
         this.createTime = createTime;
         this.createUser = createUser;

imcs-bt-be/imcs-oauth-biz/src/main/java/com/github/zuihou/oauth/granter/TokenGranterBuilder.java

@@ -21,6 +21,7 @@ public class TokenGranterBuilder {
     private Map<String, TokenGranter> granterPool = new ConcurrentHashMap<>();
 
     public TokenGranterBuilder(Map<String, TokenGranter> granterPool) {
+        System.out.println("调用了TokenGranterBuilder的构造函数");
         granterPool.forEach(this.granterPool::put);
 
     }

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/productionresource/components/addEquGoods.vue

@@ -333,6 +333,7 @@ export default {
       this.equId = "";
       this.existGoodsIds = [];
       this.equAndGoods = [];
+
       this.search();
     },
     submitForm() {