开源不易

wuxw

2019-10-24 e6a1e328ad82b1811c37d9e2f880f4e6843c863d

开源不易

 CommonService/docker/docker-compose.yml

@@ -7,7 +7,7 @@
          dockerfile: Dockerfile
       restart: always
       ports:
       - "8009:8009"
       - "8005:8005"
       volumes:
       - ../target/CommonService.jar:/root/target/CommonService.jar
       networks:

 CommonService/pom.xml

@@ -70,7 +70,7 @@
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <configuration>
                    <mainClass>com.java110.community.CommunityServiceApplicationStart</mainClass>
                    <mainClass>com.java110.common.CommonServiceApplicationStart</mainClass>
                </configuration>
            </plugin>
        </plugins>

 CommonService/src/main/java/com/java110/common/activity/ResourceEntryListener.java

New file
@@ -0,0 +1,11 @@
package com.java110.common.activity;

import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;

public class ResourceEntryListener implements TaskListener {
    @Override
    public void notify(DelegateTask delegateTask) {

    }
}

 CommonService/src/main/resources/processes/resourceEnter.bpmn

New file
@@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" xmlns:tns="http://www.activiti.org/test" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" expressionLanguage="http://www.w3.org/1999/XPath" id="m1571834527418" name="" targetNamespace="http://www.activiti.org/test" typeLanguage="http://www.w3.org/2001/XMLSchema">
  <process id="resourceEntry" isClosed="false" isExecutable="true" processType="None">
    <startEvent id="_2" name="StartEvent"/>
    <userTask activiti:exclusive="true" id="_3" name="department"/>
    <userTask activiti:exclusive="true" id="_4" name="leader"/>
    <endEvent id="_5" name="EndEvent"/>
    <sequenceFlow id="_6" sourceRef="_2" targetRef="_3"/>
    <sequenceFlow id="_7" sourceRef="_3" targetRef="_4"/>
    <sequenceFlow id="_8" sourceRef="_4" targetRef="_5"/>
  </process>
  <bpmndi:BPMNDiagram documentation="background=#FFFFFF;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0" id="Diagram-_1" name="New Diagram">
    <bpmndi:BPMNPlane bpmnElement="resourceEntry">
      <bpmndi:BPMNShape bpmnElement="_2" id="Shape-_2">
        <omgdc:Bounds height="32.0" width="32.0" x="245.0" y="55.0"/>
        <bpmndi:BPMNLabel>
          <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
        </bpmndi:BPMNLabel>
      </bpmndi:BPMNShape>
      <bpmndi:BPMNShape bpmnElement="_3" id="Shape-_3">
        <omgdc:Bounds height="55.0" width="85.0" x="220.0" y="150.0"/>
        <bpmndi:BPMNLabel>
          <omgdc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
        </bpmndi:BPMNLabel>
      </bpmndi:BPMNShape>
      <bpmndi:BPMNShape bpmnElement="_4" id="Shape-_4">
        <omgdc:Bounds height="55.0" width="85.0" x="215.0" y="265.0"/>
        <bpmndi:BPMNLabel>
          <omgdc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
        </bpmndi:BPMNLabel>
      </bpmndi:BPMNShape>
      <bpmndi:BPMNShape bpmnElement="_5" id="Shape-_5">
        <omgdc:Bounds height="32.0" width="32.0" x="255.0" y="390.0"/>
        <bpmndi:BPMNLabel>
          <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
        </bpmndi:BPMNLabel>
      </bpmndi:BPMNShape>
      <bpmndi:BPMNEdge bpmnElement="_6" id="BPMNEdge__6" sourceElement="_2" targetElement="_3">
        <omgdi:waypoint x="261.0" y="87.0"/>
        <omgdi:waypoint x="261.0" y="150.0"/>
        <bpmndi:BPMNLabel>
          <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
        </bpmndi:BPMNLabel>
      </bpmndi:BPMNEdge>
      <bpmndi:BPMNEdge bpmnElement="_7" id="BPMNEdge__7" sourceElement="_3" targetElement="_4">
        <omgdi:waypoint x="260.0" y="205.0"/>
        <omgdi:waypoint x="260.0" y="265.0"/>
        <bpmndi:BPMNLabel>
          <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
        </bpmndi:BPMNLabel>
      </bpmndi:BPMNEdge>
      <bpmndi:BPMNEdge bpmnElement="_8" id="BPMNEdge__8" sourceElement="_4" targetElement="_5">
        <omgdi:waypoint x="271.0" y="320.0"/>
        <omgdi:waypoint x="271.0" y="390.0"/>
        <bpmndi:BPMNLabel>
          <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
        </bpmndi:BPMNLabel>
      </bpmndi:BPMNEdge>
    </bpmndi:BPMNPlane>
  </bpmndi:BPMNDiagram>
</definitions>

 CommonService/src/main/resources/processes/resourceEntryStore.bpmn

File was deleted

 WebService/src/main/java/com/java110/web/components/ItemOutBindingComponent.java

New file
@@ -0,0 +1,35 @@
package com.java110.web.components;

import com.java110.core.context.IPageData;
import com.java110.web.smo.itemOut.IItemOutBindingSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;

/**
 * 添加物品出库组件
 */
@Component("itemOutBinding")
public class ItemOutBindingComponent {

    @Autowired
    private IItemOutBindingSMO itemOutBindingSMOImpl;

    /**
     * 添加物品出库数据
     *
     * @param pd 页面数据封装
     * @return ResponseEntity 对象
     */
    public ResponseEntity<String> binding(IPageData pd) {
        return itemOutBindingSMOImpl.bindingItemOut(pd);
    }

    public IItemOutBindingSMO getItemOutBindingSMOImpl() {
        return itemOutBindingSMOImpl;
    }

    public void setItemOutBindingSMOImpl(IItemOutBindingSMO itemOutBindingSMOImpl) {
        this.itemOutBindingSMOImpl = itemOutBindingSMOImpl;
    }
}

 WebService/src/main/java/com/java110/web/smo/itemOut/IItemOutBindingSMO.java

New file
@@ -0,0 +1,19 @@
package com.java110.web.smo.itemOut;

import com.java110.core.context.IPageData;
import org.springframework.http.ResponseEntity;

/**
 * 添加物品出库接口
 *
 * add by wuxw 2019-06-30
 */
public interface IItemOutBindingSMO {

    /**
     * 添加物品出库
     * @param pd 页面数据封装
     * @return ResponseEntity 对象
     */
    ResponseEntity<String> bindingItemOut(IPageData pd);
}

 WebService/src/main/java/com/java110/web/smo/itemOut/impl/ItemOutBindingSMOImpl.java

New file
@@ -0,0 +1,64 @@
package com.java110.web.smo.itemOut.impl;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.utils.constant.PrivilegeCodeConstant;
import com.java110.utils.constant.ServiceCodeItemOutConstant;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.util.Assert;
import com.java110.core.context.IPageData;
import com.java110.web.core.AbstractComponentSMO;
import com.java110.web.smo.itemOut.IItemOutBindingSMO;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.web.client.RestTemplate;

/**
 * 添加小区服务实现类
 * add by wuxw 2019-06-30
 */
@Service("itemOutBindingSMOImpl")
public class ItemOutBindingSMOImpl extends AbstractComponentSMO implements IItemOutBindingSMO {

    @Autowired
    private RestTemplate restTemplate;

    @Override
    protected void validate(IPageData pd, JSONObject paramIn) {

        //super.validatePageInfo(pd);
        JSONArray infos = paramIn.getJSONArray("data");
        //Assert.hasKeyAndValue(paramIn, "xxx", "xxx");
        


        super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.ITEMOUT);

    }

    @Override
    protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
        ResponseEntity<String> responseEntity = null;
        super.validateStoreStaffCommunityRelationship(pd, restTemplate);

        responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
                ServiceConstant.SERVICE_API_URL + "/api/" + ServiceCodeItemOutConstant.BINDING_ITEMOUT,
                HttpMethod.POST);
        return responseEntity;
    }

    @Override
    public ResponseEntity<String> bindingItemOut(IPageData pd) {
        return super.businessProcess(pd);
    }

    public RestTemplate getRestTemplate() {
        return restTemplate;
    }

    public void setRestTemplate(RestTemplate restTemplate) {
        this.restTemplate = restTemplate;
    }
}

 WebService/src/main/resources/components/itemOutPackage/itemOut/itemOut.html

New file
@@ -0,0 +1,41 @@
<div id="component">

    <div class="java110_step">
        <div id="step"></div>
    </div>

    <!-- 选择 应用信息 -->
    <div v-if="itemOutInfo.index == 0">
        <vc:create name="resourceStoreManage"
                   callBackListener="itemOut"
                   callBackFunction="notify"
        ></vc:create>
    </div>
    <div v-if="itemOutInfo.index == 1">
        <vc:create name="viewStaffInfo"
                   callBackListener="itemOut"
                   callBackFunction="notify"
        ></vc:create>
    </div>
    <div v-if="itemOutInfo.index == 2">
        <vc:create name="viewOrgInfo"
                   callBackListener="itemOut"
                   callBackFunction="notify"
        ></vc:create>
    </div>


    <div class="row">
        <div class="col-md-10"></div>
        <div class="col-md-2 " style="margin-bottom:10px; text-align:right">
            <button type="button" class="btn btn-secondary" v-on:click="_prevStep()">上一步</button>
            <button v-if="itemOutInfo.index != 2" type="button" class="btn btn-primary" style="margin-left:10px;"
                    v-on:click="_nextStep()">下一步
            </button>
            <button v-if="itemOutInfo.index == 2" type="button" class="btn btn-primary" style="margin-left:10px;"
                    v-on:click="_finishStep()">完成
            </button>
        </div>
    </div>

</div>

 WebService/src/main/resources/components/itemOutPackage/itemOut/itemOut.js

New file
@@ -0,0 +1,93 @@
/**
    入驻小区
**/
(function(vc){
    vc.extends({
        data:{
            itemOutInfo:{
                $step:{},
                index:0,
                infos:[]
            }
        },
        _initMethod:function(){
            vc.component._initStep();
        },
        _initEvent:function(){
            vc.on("itemOut", "notify", function(_info){
                vc.component.itemOutInfo.infos[vc.component.itemOutInfo.index] = _info;
            });

        },
        methods:{
            _initStep:function(){
                vc.component.itemOutInfo.$step = $("#step");
                vc.component.itemOutInfo.$step.step({
                    index: 0,
                    time: 500,
                    title: ["选择物品","选择员工","选择员工"]
                });
                vc.component.itemOutInfo.index = vc.component.itemOutInfo.$step.getIndex();
            },
            _prevStep:function(){
                vc.component.itemOutInfo.$step.prevStep();
                vc.component.itemOutInfo.index = vc.component.itemOutInfo.$step.getIndex();

                vc.emit('viewItemOutInfo', 'onIndex', vc.component.itemOutInfo.index);
vc.emit('viewStaffInfo', 'onIndex', vc.component.itemOutInfo.index);
vc.emit('viewOrgInfo', 'onIndex', vc.component.itemOutInfo.index);

            },
            _nextStep:function(){
                var _currentData = vc.component.itemOutInfo.infos[vc.component.itemOutInfo.index];
                if( _currentData == null || _currentData == undefined){
                    vc.message("请选择或填写必选信息");
                    return ;
                }
                vc.component.itemOutInfo.$step.nextStep();
                vc.component.itemOutInfo.index = vc.component.itemOutInfo.$step.getIndex();

                 vc.emit('viewItemOutInfo', 'onIndex', vc.component.itemOutInfo.index);
vc.emit('viewStaffInfo', 'onIndex', vc.component.itemOutInfo.index);
vc.emit('viewOrgInfo', 'onIndex', vc.component.itemOutInfo.index);

            },
            _finishStep:function(){


                var _currentData = vc.component.itemOutInfo.infos[vc.component.itemOutInfo.index];
                if( _currentData == null || _currentData == undefined){
                    vc.message("请选择或填写必选信息");
                    return ;
                }

                var param = {
                    data:vc.component.itemOutInfo.infos
                }

               vc.http.post(
                   'itemOutBinding',
                   'binding',
                   JSON.stringify(param),
                   {
                       emulateJSON:true
                    },
                    function(json,res){
                       if(res.status == 200){

                           vc.message('处理成功',true);
                           //关闭model
                           vc.jumpToPage("/flow/itemOut?" + vc.objToGetParam(JSON.parse(json)));
                           return ;
                       }
                       vc.message(json);
                    },
                    function(errInfo,error){
                       console.log('请求失败处理');

                       vc.message(errInfo);
                    });
            }
        }
    });
})(window.vc);

 WebService/src/main/resources/components/parkingSpacePackage/list-parking-space/listParkingSpace.html

@@ -11,7 +11,7 @@
                        </button>
                    </div>
                </div>
                <div class="ibox-content" v-if="listParkingSpaceInfo.moreCondition">
                <div class="ibox-content" >
                    <div class="row">
                        <div class="col-sm-4">
                            <div class="form-group">
@@ -33,19 +33,20 @@
                                       v-model="listParkingSpaceInfo.conditions.area">
                            </div>
                        </div>
                    </div>
                    <div class="row">
                        <div class="col-sm-4">
                            <div class="form-group">
                                <input type="text" placeholder="请填写车位编号" class=" form-control" v-model="listParkingSpaceInfo.num">
                            </div>
                        </div>
                        <div class="col-sm-1">
                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryRoomMethod()"><i
                                    class="glyphicon glyphicon-search"></i> 查询
                            </button>
                        </div>
                    </div>
                    <div class="row" v-if="listParkingSpaceInfo.moreCondition">
                        <div class="col-sm-4">
                            <div class="form-group">
                                <input type="text" placeholder="请填写车位编号" class=" form-control" v-model="listParkingSpaceInfo.num">
                            </div>
                        </div>

                    </div>
                </div>
            </div>
        </div>

 WebService/src/main/resources/views/itemOutFlow.html

New file
@@ -0,0 +1,38 @@
<!DOCTYPE html>
<html lang="en"
      xmlns="http://www.w3.org/1999/xhtml"
      xmlns:th="http://www.thymeleaf.org"
      xmlns:vc="http://www.thymeleaf.org">
<head>
    <meta charset="UTF-8"/>
    <title>物品出库|java110</title>
    <vc:create name="commonTop"></vc:create>
    <link href="/css/jquery.step.css" rel="stylesheet"/>
    <script src="/js/jquery.step.min.js"></script>
</head>
<body>
<vc:create name="bodyTop"></vc:create>
<div id="wrapper">
    <vc:create name="menu"></vc:create>


        <div id="page-wrapper" class="gray-bg dashbard-1">
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="itemOut"></vc:create>
        </div>

        <vc:create name="copyright"></vc:create>

    </div>
</div>

<vc:create name="commonBottom"></vc:create>
</body>
</html>

 java110-utils/src/main/java/com/java110/utils/constant/PrivilegeCodeConstant.java

@@ -113,6 +113,6 @@
    public static final String AGENT_HAS_LIST_RESOURCESTORE = "502019102151130004";



    public static final String ITEMOUT="5020191023000001";

}

 java110-utils/src/main/java/com/java110/utils/constant/ServiceCodeItemOutConstant.java

New file
@@ -0,0 +1,16 @@
package com.java110.utils.constant;

/**
 * 物品出库常量类
 * Created by wuxw on 2017/5/20.
 */
public class ServiceCodeItemOutConstant {

    /**
     * 添加 物品出库
     */
    public static final String BINDING_ITEMOUT = "itemOut.itemOut";



}